[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-782-gd639116

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 83bb09681305212bbcdd31a99fe7f95ba6185263
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 2 15:34:28 2012 +0200

    p-s: compute the Packages file URL
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 890a38f..78476e3 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -76,6 +76,7 @@ class Config(piupartslib.conf.Config):
                 "mirror": None,
                 "piuparts-cmd": "sudo piuparts",
                 "distro": None,
+                "area": None,
                 "chroot-tgz": None,
                 "upgrade-test-distros": None,
                 "upgrade-test-chroot-tgz": None,
@@ -584,16 +585,7 @@ def create_or_replace_chroot_tgz(config, tgz, distro):
                 os.unlink(tgz + ".old")
 
 def fetch_packages_file(config, distro):
-    mirror = config["mirror"]
-    arch = config["arch"]
-    if not arch:
-        # Try to figure it out ourselves, using dpkg
-        p = subprocess.Popen(["dpkg", "--print-architecture"],
-                             stdout=subprocess.PIPE)
-        arch = p.stdout.read().rstrip()
-    packages_url = \
-        "%s/dists/%s/main/binary-%s/Packages.bz2" % (mirror, distro, arch)
-
+    packages_url = config.get_packages_url(distro)
     logging.debug("Fetching %s" % packages_url)
     f = piupartslib.open_packages_url(packages_url)
     packages_file = piupartslib.packagesdb.PackagesFile(f)

-- 
piuparts git repository