[Piuparts-commits] rev 687 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2010-05-21 11:01:59 +0000 (Fri, 21 May 2010)
New Revision: 687

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
fix logrotate test

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-05-18 07:32:50 UTC (rev 686)
+++ trunk/debian/changelog	2010-05-21 11:01:59 UTC (rev 687)
@@ -46,6 +46,7 @@
   * piuparts.1.txt: update the pointer to custom-scripts.txt to point to
     README.txt, as those two files have been merged. Thanks to Gregor Hermann
     for spotting this. (Closes: #574504)
+  *
 
   [ Evgeni Golov ]
   * piuparts.py:

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-05-18 07:32:50 UTC (rev 686)
+++ trunk/piuparts.py	2010-05-21 11:01:59 UTC (rev 687)
@@ -1086,9 +1086,9 @@
                 continue 
 
             (retval, output) = self.run(['/usr/sbin/logrotate', file])
-            if output:
+            if output or retval != 0:
                 failed = True
-                logging.error("FAIL: Logrotate file %s has output with package removed" % file)
+                logging.error("FAIL: Logrotate file %s exits with error or has output with package removed" % file)
 
         if failed:
             panic()