[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-167-gc2d72c8

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 08ec512fe2a9a4d1464b60c183f6d0430f14b2fc
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 3 20:32:20 2013 +0100

    p-s: simplify piuparts command generation
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 4c80f92..ab213c4 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -668,15 +668,25 @@ def test_package(config, pname, pvers, packages_files):
     if not basetgz:
         ret = -11111
 
-    base_command = config["piuparts-command"].split()
+    command = config["piuparts-command"].split()
     if config["piuparts-flags"]:
-        base_command.extend(config["piuparts-flags"].split())
+        command.extend(config["piuparts-flags"].split())
     if "http_proxy" in os.environ:
-        base_command.extend(["--proxy", os.environ["http_proxy"]])
+        command.extend(["--proxy", os.environ["http_proxy"]])
     if config["mirror"]:
-        base_command.extend(["--mirror", config["mirror"]])
+        command.extend(["--mirror", config["mirror"]])
     if config["tmpdir"]:
-        base_command.extend(["--tmpdir", config["tmpdir"]])
+        command.extend(["--tmpdir", config["tmpdir"]])
+    command.extend(["-b", basetgz])
+    if not distupgrade:
+        command.extend(["-d", config.get_distro()])
+        command.append("--no-upgrade-test")
+    else:
+        for distro in config.get_distros():
+            command.extend(["-d", distro])
+    if config["keep-sources-list"] in ["yes", "true"]:
+        command.append("--keep-sources-list")
+    command.extend(["--apt", "%s=%s" % (pname, pvers)])
 
     subdir = "fail"
 
@@ -696,15 +706,6 @@ def test_package(config, pname, pvers, packages_files):
         if ret != 0:
             subdir = "untestable"
 
-    if ret == 0 and not distupgrade:
-        command = base_command[:]
-        command.extend(["-b", config["chroot-tgz"]])
-        command.extend(["-d", config.get_distro()])
-        command.append("--no-upgrade-test")
-        if config["keep-sources-list"] in ["yes", "true"]:
-            command.append("--keep-sources-list")
-        command.extend(["--apt", "%s=%s" % (pname, pvers)])
-
     if ret == 0 and distupgrade:
         distros = config.get_distros()
         if distros:
@@ -741,13 +742,6 @@ def test_package(config, pname, pvers, packages_files):
         if ret != 0:
             subdir = "untestable"
 
-    if ret == 0 and distupgrade:
-        command = base_command[:]
-        command.extend(["-b", config["upgrade-test-chroot-tgz"]])
-        for distro in config.get_distros():
-            command.extend(["-d", distro])
-        command.extend(["--apt", "%s=%s" % (pname, pvers)])
-
     if ret == 0:
         output.write("Executing: %s\n" % " ".join(command))
         ret,f = run_test_with_timeout(command, MAX_WAIT_TEST_RUN)

-- 
piuparts git repository