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

[Holger Levsen]

Author: holger
Date: 2010-12-28 14:43:15 +0000 (Tue, 28 Dec 2010)
New Revision: 842

Modified:
   trunk/debian/changelog
   trunk/piuparts.py
Log:
don't panic if package is not known by apt-get, this probably just means
someone is testing a package not yet in the archive. (Closes: #566672)
Thanks to Cleto Martin Angelina for the patch!

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-12-28 01:38:46 UTC (rev 841)
+++ trunk/debian/changelog	2010-12-28 14:43:15 UTC (rev 842)
@@ -73,7 +73,9 @@
     - apply patch by Andres Mejia to fix parsing of the --force-confdef option
       and also to configure apt to use that option. Thanks, Andres. 
       (Closes: #605475)
-
+    - don't panic if package is not known by apt-get, this probably just means
+      someone is testing a package not yet in the archive. (Closes: #566672)
+      Thanks to Cleto Martin Angelina for the patch!
   * 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 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-12-28 01:38:46 UTC (rev 841)
+++ trunk/piuparts.py	2010-12-28 14:43:15 UTC (rev 842)
@@ -751,14 +751,11 @@
     
     def apt_get_knows(self, package_names):
         """Does apt-get (or apt-cache) know about a set of packages?"""
+
         for name in package_names:
             (status, output) = self.run(["apt-cache", "show", name],
                                         ignore_errors=True)
-            if not os.WIFEXITED(status):
-                logging.error("Error occurred when running apt-cache " +
-                              " in chroot:\n" + output)
-                panic()
-            if os.WEXITSTATUS(status) != 0 or not output.strip():
+            if status != 0:
                 return False
         return True