[Piuparts-commits] rev 782 - in trunk: debian piupartslib

[Holger Levsen]

Author: holger
Date: 2010-11-15 22:49:48 +0000 (Mon, 15 Nov 2010)
New Revision: 782

Modified:
   trunk/debian/changelog
   trunk/piupartslib/packagesdb.py
Log:
forget reservations of untestable packages.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-11-14 21:18:27 UTC (rev 781)
+++ trunk/debian/changelog	2010-11-15 22:49:48 UTC (rev 782)
@@ -30,10 +30,11 @@
       before this change.
     - get rid of the long unused states "fixed" and "fix-not-yet-tested"
       (also in piuparts-master and piuparts-report).
+    - forget reservations of untestable packages.
   * piuparts-slave.py: 
     - fix crash when going into sleep when idle. 
     - add support for only doing upgrade tests (without the basic test in the
-      upgrade target distro). 
+      upgrade target distro).
   * piuparts.py: 
     - new option: --log-level to specify the verbosity of piuparts
       output. Thanks to Fabrice Coutadeur for the patch! (Closes: #567190)

Modified: trunk/piupartslib/packagesdb.py
===================================================================
--- trunk/piupartslib/packagesdb.py	2010-11-14 21:18:27 UTC (rev 781)
+++ trunk/piupartslib/packagesdb.py	2010-11-15 22:49:48 UTC (rev 782)
@@ -493,6 +493,8 @@
     def make_package_untestable(self, package, version, log):
         self._check_for_acceptability_as_filename(package)
         self._check_for_acceptability_as_filename(version)
-        if not self._logdb.create(self._evil, package, version, log):
+        if self._logdb.create(self._evil, package, version, log):
+            self._logdb.remove(self._reserved, package, version)
+        else:
             raise Exception("Log file exists already: %s (%s)" %
                                 (package, version))