[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] oh yay, we get away without the s-u-p-u, anything will be taken from s-p-u



Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/debian/apache.conf-incoming |    1 -
 daklib/queue.py                    |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 3e4de61..0edf6dc 100644
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -19,7 +19,6 @@
   # New suite aliases
   Alias /buildd-unstable /srv/incoming.debian.org/dists/unstable/current/
   Alias /buildd-experimental /srv/incoming.debian.org/dists/experimental/current/
-  Alias /buildd-squeeze-updates /srv/incoming.debian.org/dists/squeeze-updates/current/
 
   <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(dists/|builddweb)|ftp\.debian\.org/mirror)">
     Order allow,deny
diff --git a/daklib/queue.py b/daklib/queue.py
index 4196111..7a49242 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -805,7 +805,7 @@ class Upload(object):
                     entry["new"] = 1
                 else:
                     dsc_file_exists = False
-                    for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates", "Squeeze-Updates-Proposed-Updates"]:
+                    for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates"]:
                         if cnf.has_key("Dir::Queue::%s" % (myq)):
                             if os.path.exists(os.path.join(cnf["Dir::Queue::" + myq], dsc_filename)):
                                 dsc_file_exists = True
-- 
1.5.6.5


Reply to: