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

Bug#698117: unblock: rebuildd/0.4.2



Control: tags -1 - moreinfo

On Tue, 19 Mar 2013, Neil McGovern wrote:
> Is there likely to be a t-p-u upload fixing the RC bug only, ie: the
> patch in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=671635#20, or
> should I look for a removal?

0.4.1.1 uploaded with the following debdiff:

--- rebuildd-0.4.1/debian/changelog	2012-03-09 11:48:42.000000000 +0100
+++ rebuildd-0.4.1.1/debian/changelog	2013-03-20 09:30:58.000000000 +0100
@@ -1,3 +1,12 @@
+rebuildd (0.4.1.1) testing-proposed-updates; urgency=low
+
+  * Team upload to testing-proposed-updates (targeting wheezy).
+  * Drop failing code introduced by the "Build logs in database" feature
+    merged in 0.4.0. Closes: #671635
+  * Cherry-pick a second change to avoid errors in the test-suite.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Wed, 20 Mar 2013 08:59:26 +0100
+
 rebuildd (0.4.1) unstable; urgency=low
 
   [ Daniel Dehennin ]
--- rebuildd-0.4.1/rebuildd/Job.py	2012-02-13 12:11:47.000000000 +0100
+++ rebuildd-0.4.1.1/rebuildd/Job.py	2013-03-20 09:30:58.000000000 +0100
@@ -52,8 +52,6 @@
 
         threading.Thread.__init__(self)
         sqlobject.SQLObject.__init__(self, *args, **kwargs)
-        if self.log is None:
-            log = Log(job=self)
 
         self.do_quit = threading.Event()
         self.status_lock = threading.Lock()
@@ -201,7 +199,8 @@
             return False
 
         # Store in database
-        self.log.text = log
+        if self.log:
+            self.log.text = log
 
         with self.status_lock:
             if self.status != JobStatus.BUILD_OK and \


Note that the full debdiff also show removals of many files that should
never have been there in the first place (that result from improper
debian/rules clean).

Cheers,
-- 
Raphaël Hertzog ◈ Debian Developer

Get the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/


Reply to: