[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 0c1b10c12fc692fda01495b83aaae73e6e0be15e
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Nov 28 12:57:58 2011 +0100

    implement method get_known_packages()
    
    get_known_packages(packages) returns a subset of packages that are known
    to apt-cache in the chroot. Useful to filter out newly added packages
    (package split etc.) that can't be installed from the archive.
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts.py b/piuparts.py
index d17b241..33ebd4d 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -940,14 +940,32 @@ class Chroot:
             self.check_for_no_processes()
 
     def apt_get_knows(self, packages):
+        return self.get_known_packages(packages)
+
+    def get_known_packages(self, packages):
         """Does apt-get (or apt-cache) know about a set of packages?"""
 
+        known_packages = []
+        new_packages = []
         for name in packages:
             (status, output) = self.run(["apt-cache", "show", name],
                                         ignore_errors=True)
-            if status != 0:
-                return False
-        return True
+            # apt-cache reports status for some virtual packages and packages
+            # in status config-files-remaining state without installation
+            # candidate -- but only real packages have Filename/MD5sum/SHA*
+            if status != 0 or re.search(r'^(Filename|MD5sum|SHA1|SHA256):', output, re.M) is None:
+                new_packages.append(name)
+            else:
+                known_packages.append(name)
+        if not known_packages:
+            logging.info("apt-cache does not know about any of the requested packages")
+        else:
+            logging.info("apt-cache knows about the following packages: " +
+                    ", ".join(known_packages))
+            if new_packages:
+                logging.info("the following packages are not in the archive: " +
+                        ", ".join(new_packages))
+        return known_packages
 
     def copy_files(self, source_names, target_name):
         """Copy files in 'source_name' to file/dir 'target_name', relative

-- 
piuparts git repository