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

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 41438297e8fcbdfeb7713b87f05fd4bcf4e12fc3
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Nov 28 13:35:01 2011 +0100

    pass the package names in addition to the files to install_package_files
    
    will be used in later patches
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts.py b/piuparts.py
index d17b241..3cbf59c 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -985,7 +985,7 @@ class Chroot:
             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]
@@ -1936,7 +1936,7 @@ def install_purge_test(chroot, root_info, selections, package_files, packages):
         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)
 
@@ -1971,7 +1971,7 @@ def install_upgrade_test(chroot, root_info, selections, package_files, packages)
 
     # 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()
@@ -2092,7 +2092,7 @@ def install_and_upgrade_between_distros(package_files, packages):
 
     os.environ["PIUPARTS_PHASE"] = "upgrade"
 
-    chroot.install_package_files(package_files)
+    chroot.install_package_files(package_files, packages)
 
     chroot.check_for_no_processes()
 

-- 
piuparts git repository