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

[Holger Levsen]

Author: holger
Date: 2009-12-12 12:42:11 +0000 (Sat, 12 Dec 2009)
New Revision: 560

Modified:
   trunk/README.txt
   trunk/debian/changelog
   trunk/piuparts.py
Log:
Add another type of custom-scripts, post_setup_, which are executed after
the chroot was setup. (Closes: #466043)

Modified: trunk/README.txt
===================================================================
--- trunk/README.txt	2009-12-10 14:04:37 UTC (rev 559)
+++ trunk/README.txt	2009-12-12 12:42:11 UTC (rev 560)
@@ -130,6 +130,11 @@
 
 The scripts can be run:
 
+After the *setup* of the chroot is finished. The name of the script must
+start with:
+
+'post_setup_'
+
 Before *installing* your package. The name of the script must
 start with:
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-10 14:04:37 UTC (rev 559)
+++ trunk/debian/changelog	2009-12-12 12:42:11 UTC (rev 560)
@@ -20,6 +20,8 @@
       /etc/apt/apt.conf.
     * Create policy-rc.d in 2nd chroot when using -b. (Closes: #466049)
       Thanks again to Patrick Schoenfeld for his help.
+    * Add another type of custom-scripts, post_setup_, which are executed after
+      the chroot was setup. (Closes: #466043)
   * piuparts-report: report broken symlinks.
   * piuparts-slave: 
     - gracefully deal with upgrade-test-distros and upgrade-test-chroot-tgz 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2009-12-10 14:04:37 UTC (rev 559)
+++ trunk/piuparts.py	2009-12-12 12:42:11 UTC (rev 560)
@@ -581,6 +581,10 @@
                 if (file.startswith("post_") or file.startswith("pre_")) and os.path.isfile(os.path.join((settings.scriptsdir), file)):
                     shutil.copy(os.path.join((settings.scriptsdir), file), dest) 
 
+        # Run custom scripts after creating the chroot.
+        if settings.scriptsdir is not None: 
+            self.run_scripts("post_setup")
+
         if settings.savetgz:
             self.pack_into_tgz(settings.savetgz)