[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.48-19-g93bfc2b

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 4de9e04cd58aad1d2757d8b960e5b1acf275f412
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Nov 5 19:04:45 2012 +0100

    p-s: drop old checking code from Section._process()
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index e34f0a7..f17a6a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ piuparts (0.49) UNRELEASED; urgency=low
   * piuparts-master.py:
   * piuparts-slave.py:
     - Disable X forwarding while connecting to master.
+    - Move checks for package existence to test_package().
   * piuparts-report.py:
     - Hardlink the logfiles to the htdocs tree (with copy as fallback).
   * pre_remove_50_find_missing_copyright: Skip check for packages that are not
diff --git a/piuparts-slave.py b/piuparts-slave.py
index fe8c495..395f51c 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -516,10 +516,6 @@ class Section:
                     logging.error("failed to fetch packages file for %s" % distro)
                     self._error_wait_until = time.time() + 900
                     return 0
-        if self._config["distro"]:
-            packages_file = packages_files[self._config["distro"]]
-        else:
-            packages_file = packages_files[distro]
 
         test_count = 0
         self._check_tarball()
@@ -527,21 +523,7 @@ class Section:
             if got_sighup:
                 break
             test_count += 1
-            if package_name in packages_file:
-                package = packages_file[package_name]
-                if version == package["Version"]:
-                    test_package(self._config, package_name, version, packages_files, package)
-                else:
-                    logging.info("Cannot test %s/%s %s" % (self._config.section, package_name, version))
-                    create_file(os.path.join("untestable",
-                                log_name(package_name, version)),
-                                "%s %s not found, %s is available\n" \
-                                    % (package_name, version, package["Version"]))
-            else:
-                logging.info("Cannot test %s/%s %s" % (self._config.section, package_name, version))
-                create_file(os.path.join("untestable",
-                            log_name(package_name, version)),
-                            "Package %s not found\n" % package_name)
+            test_package(self._config, package_name, version, packages_files)
             self._slave.forget_reserved(package_name, version)
             if interrupted:
                 break
@@ -620,7 +602,7 @@ def run_test_with_timeout(cmd, maxwait, kill_all=True):
     return p.returncode,stdout
 
 
-def test_package(config, pname, pvers, packages_files, package):
+def test_package(config, pname, pvers, packages_files):
     global old_sigint_handler
     old_sigint_handler = signal(SIGINT, sigint_handler)
 
@@ -632,9 +614,6 @@ def test_package(config, pname, pvers, packages_files, package):
     output = file(new_name, "we")
     output.write(time.strftime("Start: %Y-%m-%d %H:%M:%S %Z\n",
                                time.gmtime()))
-    output.write("\n")
-    package.dump(output)
-    output.write("\n")
 
     base_command = config["piuparts-command"].split()
     if config["piuparts-flags"]:

-- 
piuparts git repository