[Piuparts-commits] rev 792 - piatti/org/piuparts.debian.org/etc/scripts trunk

[Holger Levsen]

Author: holger
Date: 2010-11-24 19:00:14 +0000 (Wed, 24 Nov 2010)
New Revision: 792

Modified:
   piatti/org/piuparts.debian.org/etc/scripts/pre_install_prepare_exceptions
   trunk/piuparts.py
Log:
fix

Modified: piatti/org/piuparts.debian.org/etc/scripts/pre_install_prepare_exceptions
===================================================================
--- piatti/org/piuparts.debian.org/etc/scripts/pre_install_prepare_exceptions	2010-11-24 18:50:01 UTC (rev 791)
+++ piatti/org/piuparts.debian.org/etc/scripts/pre_install_prepare_exceptions	2010-11-24 19:00:14 UTC (rev 792)
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 echo "DebugXXX: running $0 $1"
+echo "DebugXXX: PIUPARTS_OBJECTS = $PIUPARTS_OBJECTS"
 case $1 in 
 	sudo) 	echo "DebugXXX: hurray, sudo package being tested" ;;
 	*)	echo "DebugXXX: hurray, something else tested" ;;

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2010-11-24 18:50:01 UTC (rev 791)
+++ trunk/piuparts.py	2010-11-24 19:00:14 UTC (rev 792)
@@ -375,6 +375,7 @@
     env = os.environ.copy()
     env["LC_ALL"] = "C"
     env["LANGUAGES"] = ""
+    env["PIUPARTS_OBJECTS"] = settings.testobjects
     p = subprocess.Popen(command, env=env, stdin=subprocess.PIPE, 
                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     (output, _) = p.communicate()
@@ -1121,7 +1122,7 @@
         for file in list_scripts:
             if file.startswith(step):
                 script = os.path.join("tmp/scripts", file)
-                self.run([script, settings.testobjects]) 
+                self.run([script) 
 
 
 class VirtServ(Chroot):