[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.52-50-g1ca8406

[Andreas Beckmann]

The following commit has been merged in the bikeshed branch:
commit 2f24a32c69622e4c483982270f322818f807bc62
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri May 31 16:50:06 2013 +0200

    p: relax the check for running processes for --allow-database
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index f55c264..33a02dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ piuparts (0.53) UNRELEASED; urgency=low
     - Do not run adequate checks on possibly disappearing packages.
     - Add --allow-database option that enables starting MySQL and PostgreSQL
       database servers in the chroot.
+    - Relax the check for running processes if --allow-database is given.
   * piuparts.conf:
   * distros.conf:
     - Add "candidates" key to merge multiple Packages files into one virtual
diff --git a/piuparts.py b/piuparts.py
index 9c5e668..c42778b 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1442,11 +1442,13 @@ class Chroot:
         return vdict
 
 
-    def check_for_no_processes(self, fail=True):
+    def check_for_no_processes(self, fail=None):
         """Check there are no processes running inside the chroot."""
         (status, output) = run(["lsof", "-w", "+D", self.name], ignore_errors=True)
         count = len(output.split("\n")) - 1
         if count > 0:
+            if fail is None:
+                fail = not settings.allow_database
             logging.error("%s: Processes are running inside chroot:\n%s" %
                           ("FAIL" if fail else "WARN", indent_string(output)))
             if fail:

-- 
piuparts git repository