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

[dak/master] daklib/queue



drop the condition on bts-changelog and source upload.
bts -> old old comment says it should have been done years ago
source -> don says bts has no problem with it getting the files
always.

maybe this "fixes" the bug where we not write .versions for all
uploads, just some. seemingly random.
maybe it just gets is to backtrace lots.
lets see, a surprise for the new year.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 daklib/queue.py |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/daklib/queue.py b/daklib/queue.py
index 7280405..76d19c1 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1944,22 +1944,14 @@ distribution."""
 
         ## Helper stuff for DebBugs Version Tracking
         if cnf.Find("Dir::Queue::BTSVersionTrack"):
-            # ??? once queue/* is cleared on *.d.o and/or reprocessed
-            # the conditionalization on dsc["bts changelog"] should be
-            # dropped.
-
-            # Write out the version history from the changelog
-            if self.pkg.changes["architecture"].has_key("source") and \
-               self.pkg.dsc.has_key("bts changelog"):
-
-                (fd, temp_filename) = utils.temp_filename(cnf["Dir::Queue::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"],
-                                      self.pkg.changes_file[:-8]+".versions")
-                os.rename(temp_filename, filename)
-                os.chmod(filename, 0644)
+            (fd, temp_filename) = utils.temp_filename(cnf["Dir::Queue::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"],
+                                  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=".")
-- 
1.6.5


Reply to: