[Piuparts-commits] rev 807 - trunk

[Holger Levsen]

Author: holger
Date: 2010-11-25 00:02:05 +0000 (Thu, 25 Nov 2010)
New Revision: 807

Modified:
   trunk/piuparts.py
Log:
bugfix: run (more) custom scripts in the upgrad test

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-11-24 21:58:27 UTC (rev 806)
+++ trunk/piuparts.py	2010-11-25 00:02:05 UTC (rev 807)
@@ -937,6 +937,9 @@
 
     def install_packages_by_name(self, packages):
         if packages:
+            if settings.scriptsdir is not None:
+                self.run_scripts("pre_install")
+
 	    if settings.list_installed_files:
                 pre_info = self.save_meta_data()
                 self.run(["apt-get", "-y", "install"] + packages)
@@ -1781,10 +1784,13 @@
         id = do_on_panic(chroot.remove)
 
     chroot.check_for_no_processes()
-    
+
     chroot.run(["apt-get", "update"])
     chroot.install_packages_by_name(packages)
 
+    if settings.scriptsdir is not None:
+        chroot.run_scripts("pre_upgrade")
+
     chroot.check_for_no_processes()
 
     chroot.upgrade_to_distros(settings.debian_distros[1:], packages)