[Piuparts-devel] [PATCH] pass the package names in addition to the files to install_package_files

Andreas Beckmann debian at abeckmann.de
Sun Nov 6 10:25:42 UTC 2011


will be used in later patches

Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

---
 piuparts.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/piuparts.py b/piuparts.py
index 42ea1dd..924e2b8 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -824,7 +824,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]
@@ -1729,7 +1729,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)
         chroot.run(["apt-get", "clean"])
@@ -1762,7 +1762,7 @@ def install_upgrade_test(chroot, root_info, selections, package_files, packages)
     chroot.check_for_broken_symlinks()
 
     # Then from the package files.
-    chroot.install_package_files(package_files)
+    chroot.install_package_files(package_files, packages)
     
     file_owners = chroot.get_files_owned_by_packages()
 
@@ -1868,7 +1868,7 @@ def install_and_upgrade_between_distros(package_files, packages):
 
     chroot.check_for_no_processes()
 
-    chroot.install_package_files(package_files)
+    chroot.install_package_files(package_files, packages)
     chroot.run(["apt-get", "clean"])
     
     chroot.check_for_no_processes()
-- 
tg: (741b7b7..) t/style/pass-pkgnames-with-pkgfiles (depends on: t/style/consistent-variable-names)



More information about the Piuparts-devel mailing list