[Piuparts-commits] rev 81 - trunk

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-08-29 12:17:03 +0000 (Wed, 29 Aug 2007)
New Revision: 81

Modified:
   trunk/piuparts.py
Log:
oops, previous little bugfix was not complete.


Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2007-08-29 11:42:34 UTC (rev 80)
+++ trunk/piuparts.py	2007-08-29 12:17:03 UTC (rev 81)
@@ -592,7 +592,8 @@
             tmp_files = [os.path.basename(a) for a in filenames]
             tmp_files = [os.path.join("tmp", name) for name in tmp_files]
 
-            self.run_scripts("pre_install")
+            if settings.scriptsdir is not None:
+                self.run_scripts("pre_install")
 
             if settings.list_installed_files:
                 pre_info = self.save_meta_data()
@@ -607,7 +608,8 @@
                 self.run(["dpkg", "-i"] + tmp_files, ignore_errors=True)
                 self.run(["apt-get", "-yf", "--no-remove", "install"])
 
-            self.run_scripts("post_install")
+            if settings.scriptsdir is not None:
+                self.run_scripts("post_install")
 
             self.run(["apt-get", "clean"])
             remove_files([os.path.join(self.name, name) 
@@ -814,9 +816,7 @@
     def run_scripts (self, step):
         """ Run custom scripts to given step post-install|remove|purge"""
 
-        if settings.scriptsdir is None:
-            exit
-        logging.info("Running scripts post "+ step)
+        logging.info("Running scripts "+ step)
         basepath = self.relative("tmp/scripts/")
         list_scripts = os.listdir(basepath)
         list_scripts.sort()
@@ -999,9 +999,10 @@
 
     # First install via apt-get.
     chroot.install_packages_by_name(package_names)
+    
+    if settings.scriptsdir is not None:
+        chroot.run_scripts("pre_upgrade")
 
-    chroot.run_scripts("pre_upgrade")
-
     chroot.check_for_broken_symlinks()
 
     # Then from the package files.