From: Joerg Jaspert Date: Mon, 29 Nov 2010 08:11:48 +0000 (+0100) Subject: oh yay, we get away without the s-u-p-u, anything will be taken from s-p-u X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=46ed481d97efd2ca4d0914de1dd1393300cf21a5;p=dak.git oh yay, we get away without the s-u-p-u, anything will be taken from s-p-u Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming index 3e4de619..0edf6dce 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/ Order allow,deny diff --git a/daklib/queue.py b/daklib/queue.py index 41961111..7a492422 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