[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.47-31-g82abac6

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit c7fe17aea68033fe70b3e52f5c930cf7d9558f5d
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sun Nov 4 14:16:59 2012 +0100

    p-s: use temporary variables for package name and version
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 3185ca9..a6e56bd 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -635,9 +635,12 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
 def test_package(config, package, packages_files):
     global old_sigint_handler
     old_sigint_handler = signal(SIGINT, sigint_handler)
-    logging.info("Testing package %s/%s %s" % (config.section, package["Package"], package["Version"]))
 
-    output_name = log_name(package["Package"], package["Version"])
+    pname = package["Package"]
+    pvers = package["Version"]
+    logging.info("Testing package %s/%s %s" % (config.section, pname, pvers))
+
+    output_name = log_name(pname, pvers)
     logging.debug("Opening log file %s" % output_name)
     new_name = os.path.join("new", output_name)
     output = file(new_name, "we")
@@ -659,7 +662,7 @@ def test_package(config, package, packages_files):
         command.append("--no-upgrade-test")
         if config["keep-sources-list"] in ["yes", "true"]:
             command.append("--keep-sources-list")
-        command.extend(["--apt", "%s=%s" % (package["Package"], package["Version"])])
+        command.extend(["--apt", "%s=%s" % (pname, pvers)])
 
         output.write("Executing: %s\n" % " ".join(command))
         ret,f = run_test_with_timeout(command, MAX_WAIT_TEST_RUN)
@@ -678,7 +681,7 @@ def test_package(config, package, packages_files):
         command.extend(["-b", config["upgrade-test-chroot-tgz"]])
         for distro in config["upgrade-test-distros"].split():
             command.extend(["-d", distro])
-        command.extend(["--apt", "%s=%s" % (package["Package"], package["Version"])])
+        command.extend(["--apt", "%s=%s" % (pname, pvers)])
 
         output.write("Executing: %s\n" % " ".join(command))
         ret,f = run_test_with_timeout(command, MAX_WAIT_TEST_RUN)

-- 
piuparts git repository