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>

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 3e4de6196af5d7221367a38e89e621aa11f1ffd3..0edf6dcef7fb32c29da6f4d21b125065d5aa1dd4 100644 (file)
--- 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 4196111195fdc072d608768c854c942e14211142..7a49242284026ec39f12e5fe3d13928d46094819 100755 (executable)
--- 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