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

[Holger Levsen]

The following commit has been merged in the master branch:
commit 6f50ccdc6e6026ab747b08c7c314300a8bd178e3
Merge: 4b4405991689abceaeec00c832866b8ababfabd2 41438297e8fcbdfeb7713b87f05fd4bcf4e12fc3
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Nov 28 16:01:45 2011 +0100

    Merge branch 'cleanup/pass-pkgnames-with-pkgfiles' into develop

diff --combined piuparts.py
index fb46673,3cbf59c..e2d07da
--- a/piuparts.py
+++ b/piuparts.py
@@@ -934,38 -934,20 +934,38 @@@ class Chroot
              # and installing that would require removing the old version
              # of the library, and we've told apt-get not to remove
              # packages. So, we force the installation like this.
 -            self.install_packages_by_name(packages)
 +            known_packages = self.get_known_packages(packages)
 +            self.install_packages_by_name(known_packages)
              # Run custom scripts after upgrade
              self.run_scripts("post_distupgrade")
              self.check_for_no_processes()
  
      def apt_get_knows(self, packages):
 -        """Does apt-get (or apt-cache) know about a set of 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
@@@ -1003,7 -985,7 +1003,7 @@@
              logging.debug("The package did not modify any file.\n")     
  
  
-     def install_package_files(self, package_files):
+     def install_package_files(self, package_files, packages = None):
          if package_files:
              self.copy_files(package_files, "tmp")
              tmp_files = [os.path.basename(a) for a in package_files]
@@@ -1954,7 -1936,7 +1954,7 @@@ def install_purge_test(chroot, root_inf
          deps_info = None
  
      if package_files:
-         chroot.install_package_files(package_files)
+         chroot.install_package_files(package_files, packages)
      else:
          chroot.install_packages_by_name(packages)
  
@@@ -1973,8 -1955,8 +1973,8 @@@
      return check_results(chroot, root_info, file_owners, deps_info=deps_info)
  
  
 -def install_upgrade_test(chroot, root_info, selections, package_files, packages):
 -    """Install package via apt-get, then upgrade from package files.
 +def install_upgrade_test(chroot, root_info, selections, package_files, packages, old_packages):
 +    """Install old_packages via apt-get, then upgrade from package files.
      Return True if successful, False if not."""
  
      os.environ["PIUPARTS_TEST"] = "upgrade"
@@@ -1982,14 -1964,14 +1982,14 @@@
  
      # First install via apt-get.
      os.environ["PIUPARTS_PHASE"] = "install"
 -    chroot.install_packages_by_name(packages)
 +    chroot.install_packages_by_name(old_packages)
  
      chroot.check_for_no_processes()
      chroot.check_for_broken_symlinks()
  
      # Then from the package files.
      os.environ["PIUPARTS_PHASE"] = "upgrade"
-     chroot.install_package_files(package_files)
+     chroot.install_package_files(package_files, packages)
  
      chroot.check_for_no_processes()
      chroot.check_for_broken_symlinks()
@@@ -2098,8 -2080,7 +2098,8 @@@ def install_and_upgrade_between_distros
  
      os.environ["PIUPARTS_PHASE"] = "install"
  
 -    chroot.install_packages_by_name(packages)
 +    known_packages = chroot.get_known_packages(packages)
 +    chroot.install_packages_by_name(known_packages)
  
      chroot.check_for_no_processes()
  
@@@ -2111,7 -2092,7 +2111,7 @@@
  
      os.environ["PIUPARTS_PHASE"] = "upgrade"
  
-     chroot.install_package_files(package_files)
+     chroot.install_package_files(package_files, packages)
  
      chroot.check_for_no_processes()
  
@@@ -2511,17 -2492,14 +2511,17 @@@ def process_packages(package_list)
          if not settings.no_upgrade_test:
              if not settings.args_are_package_files:
                  logging.info("Can't test upgrades: -a or --apt option used.")
 -            elif not chroot.apt_get_knows(packages):
 -                logging.info("Can't test upgrade: packages not known by apt-get.")
 -            elif install_upgrade_test(chroot, root_info, selections, package_files,
 -                                  packages):
 -                logging.info("PASS: Installation, upgrade and purging tests.")
              else:
 -                logging.error("FAIL: Installation, upgrade and purging tests.")
 -                panic()
 +                packages_to_query = packages[:]
 +                known_packages = chroot.get_known_packages(packages_to_query)
 +                if not known_packages:
 +                    logging.info("Can't test upgrade: packages not known by apt-get.")
 +                elif install_upgrade_test(chroot, root_info, selections, package_files,
 +                        packages, known_packages):
 +                    logging.info("PASS: Installation, upgrade and purging tests.")
 +                else:
 +                    logging.error("FAIL: Installation, upgrade and purging tests.")
 +                    panic()
  
          chroot.remove()
          dont_do_on_panic(cid)

-- 
piuparts git repository