BTSVersionTrack isn't a queue...

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index f2c96c56b19932d33a3a0f53c386d275c2b7a3fc..1f09c927531fcfccd652a175eb9bb0600f9beaeb 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -210,6 +210,8 @@ Dir
   Override "/srv/backports-master.debian.org/scripts/override/";
   UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/";
   TempPath "/srv/backports-master.debian.org/tmp";
+  BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
+
   Queue
   {
     Byhand "/srv/backports-master.debian.org/queue/byhand/";
@@ -218,7 +220,6 @@ Dir
     New "/srv/backports-master.debian.org/queue/new/";
     Reject "/srv/backports-master.debian.org/queue/reject/";
     Unchecked "/srv/backports-master.debian.org/queue/unchecked/";
-    BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
     Newstage "/srv/backports-master.debian.org/queue/newstage/";
     Embargoed "/srv/backports-master.debian.org/queue/Embargoed/";
     Unembargoed "/srv/backports-master.debian.org/queue/Unembargoed/";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b342a4af895ff42c8ddad3d2e301471f8c850a31..10f3e90fa81bf5475dcac225d3de20f36f56815c 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -324,6 +324,8 @@ Dir
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
+  BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
+
   Queue
   {
     Byhand "/srv/ftp-master.debian.org/queue/byhand/";
@@ -336,7 +338,6 @@ Dir
     Reject "/srv/ftp-master.debian.org/queue/reject/";
     Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
     Newstage "/srv/ftp-master.debian.org/queue/newstage/";
-    BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
     Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
     Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
     Disembargo "/srv/ftp-master.debian.org/does/not/exist/";

diff --git a/daklib/queue.py b/daklib/queue.py
index 8d27a3125d189df3dd777afa655713272ba5eca0..48d0fa3389b4a9c789a0920e495c8a344e6a3fab 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1315,7 +1315,7 @@ class Upload(object):
             self.rejects.append("'dpkg-source -x' failed for %s." % dsc_filename)
             return
 
-        if not cnf.Find("Dir::Queue::BTSVersionTrack"):
+        if not cnf.Find("Dir::BTSVersionTrack"):
             return
 
         # Get the upstream version
@@ -2192,19 +2192,19 @@ distribution."""
         self.announce(short_summary, 1)
 
         ## Helper stuff for DebBugs Version Tracking
-        if cnf.Find("Dir::Queue::BTSVersionTrack"):
+        if cnf.Find("Dir::BTSVersionTrack"):
             if self.pkg.changes["architecture"].has_key("source"):
-                (fd, temp_filename) = utils.temp_filename(cnf["Dir::Queue::BTSVersionTrack"], prefix=".")
+                (fd, temp_filename) = utils.temp_filename(cnf["Dir::BTSVersionTrack"], prefix=".")
                 version_history = os.fdopen(fd, 'w')
                 version_history.write(self.pkg.dsc["bts changelog"])
                 version_history.close()
-                filename = "%s/%s" % (cnf["Dir::Queue::BTSVersionTrack"],
+                filename = "%s/%s" % (cnf["Dir::BTSVersionTrack"],
                                       self.pkg.changes_file[:-8]+".versions")
                 os.rename(temp_filename, filename)
                 os.chmod(filename, 0644)
 
             # Write out the binary -> source mapping.
-            (fd, temp_filename) = utils.temp_filename(cnf["Dir::Queue::BTSVersionTrack"], prefix=".")
+            (fd, temp_filename) = utils.temp_filename(cnf["Dir::BTSVersionTrack"], prefix=".")
             debinfo = os.fdopen(fd, 'w')
             for name, entry in sorted(self.pkg.files.items()):
                 if entry["type"] == "deb":
@@ -2213,7 +2213,7 @@ distribution."""
                                      entry["source version"]])
                     debinfo.write(line+"\n")
             debinfo.close()
-            filename = "%s/%s" % (cnf["Dir::Queue::BTSVersionTrack"],
+            filename = "%s/%s" % (cnf["Dir::BTSVersionTrack"],
                                   self.pkg.changes_file[:-8]+".debinfo")
             os.rename(temp_filename, filename)
             os.chmod(filename, 0644)