[Piuparts-commits] rev 169 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2008-10-17 10:11:32 +0000 (Fri, 17 Oct 2008)
New Revision: 169

Modified:
   trunk/custom-scripts.txt
   trunk/debian/changelog
   trunk/piuparts.py
Log:
Rename the post_upgrade custom script to post_distupgrade and introduce
pre_distupgrade.

Modified: trunk/custom-scripts.txt
===================================================================
--- trunk/custom-scripts.txt	2008-08-19 12:32:57 UTC (rev 168)
+++ trunk/custom-scripts.txt	2008-10-17 10:11:32 UTC (rev 169)
@@ -27,6 +27,9 @@
     upgrade and purging test"). The name of the script must start with:
     pre_upgrade_
 
+    Before upgrading the chroot to another distro and after upgrading:
+    pre_distupgrade_
+    post_distupgrade_
 
 You can run several scripts in every step, they are run in alphabetical 
 order.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-08-19 12:32:57 UTC (rev 168)
+++ trunk/debian/changelog	2008-10-17 10:11:32 UTC (rev 169)
@@ -6,6 +6,8 @@
   [ Holger Levsen ]
   * Replace all references to sarge and etch with etch and lenny.
   * Update README to reflect that piuparts runs fine in etch. 
+  * Rename the post_upgrade custom script to post_distupgrade and introduce
+    pre_distupgrade.
 
  -- Holger Levsen <holger at debian.org>  Tue, 13 May 2008 11:31:07 +0200
 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2008-08-19 12:32:57 UTC (rev 168)
+++ trunk/piuparts.py	2008-10-17 10:11:32 UTC (rev 169)
@@ -642,6 +642,9 @@
         for distro in distros:
             logging.debug("Upgrading %s to %s" % (self.name, distro))
             self.create_apt_sources(distro)
+	    # Run custom scripts before upgrade
+            if settings.scriptsdir is not None:
+                self.run_scripts("pre_distupgrade")
             self.run(["apt-get", "update"])
             self.run(["apt-get", "-yf", "dist-upgrade"])
             # Sometimes dist-upgrade won't upgrade the packages we want
@@ -652,7 +655,7 @@
             self.install_packages_by_name(packages)
             # Run custom scripts after upgrade
             if settings.scriptsdir is not None:
-                self.run_scripts("post_upgrade")
+                self.run_scripts("post_distupgrade")
             self.check_for_no_processes()
     
     def apt_get_knows(self, package_names):