[Piuparts-commits] [piuparts] 01/01: p-s: fix an error in components handling

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit c50d8dc3f918a6aa87f16ef7423d706caa97619d
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Nov 6 13:16:02 2013 +0100

    p-s: fix an error in components handling
    
    and improve documentation
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 README_server.txt |   22 +++++++++++++---------
 piuparts-slave.py |    6 +++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/README_server.txt b/README_server.txt
index 4a24fab..11cc55a 100644
--- a/README_server.txt
+++ b/README_server.txt
@@ -387,15 +387,19 @@ section, too, and will serve as defaults for all other sections
  packages) or the restricted set in a partial distribution (e.g.
  stable to backports to testing).
 
-* "area" is the archive area to use, set to one of main, contrib,
- non-free. This is used for loading Packages files to get the list
- of packages to be tested. Default: "main".
-
-* "components" restricts the archive areas that will be used in
- the generated sources.list. Further restrictions may be set in
- distros.conf. Defaults to "", which means all components will be
- available. Useful setting: "main" with area = main to avoid using
- packages outside main.
+* "area" is the archive area used to get the list of packages to
+ be tested. The Packages file for this area will be loaded. The
+ default is "main" and the possible values depend on the vendor,
+ for Debian these are main, contrib, non-free.
+
+* "components" sets the archive areas that will be available when
+ testing the packages selected via the "area" setting. These will
+ be enabled in the generated sources.list.  Defaults to "", which
+ means all components will be available. A useful setting is
+ "main" together with area = main to avoid using packages outside
+ main. Testing packages from a 'partial' area like contrib or
+ non-free usually requires additional or all components to be
+ available.
 
 * "arch" is the architecture to use.
  Default: dpkg --print-architecture.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index baa9de7..fc1dc52 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -816,9 +816,9 @@ def create_chroot(config, tarball, distro):
     if "http_proxy" in os.environ:
         command.extend(["--proxy", os.environ["http_proxy"]])
     if config["mirror"]:
-        mirror = self._config["mirror"]
-        if self._config["components"]:
-            mirror += " " + self._config["components"]
+        mirror = config["mirror"]
+        if config["components"]:
+            mirror += " " + config["components"]
         command.extend(["--mirror", mirror])
     if config["tmpdir"]:
         command.extend(["--tmpdir", config["tmpdir"]])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git