[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 73f7d00a4f62f85dc8916773c94f93e762959511
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed Jun 13 15:42:23 2012 +0200

    document mirror/distro/area/arch piuparts.conf settings
    
    and their defaults
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/README.txt b/README.txt
index 50af123..36a35bf 100644
--- a/README.txt
+++ b/README.txt
@@ -441,11 +441,15 @@ section, too, and will serve as defaults for all other sections
 
 * "sources-url" is a URL to the Sources.bz2 file for your mirror. "sources-url" must match "packages-url", if it is not defined, piuparts-reports will not generate source centric html pages.
 
-* "mirror" tells the slave which mirror it is to use. The slave gives this to piuparts when it runs it. Components must not be used here. "packages-url" defines which component to use. This setting is redundant and should go away.
-
 * "piuparts-cmd" is the command the slave uses to start piuparts. It should include 'sudo' if necessary so that piuparts runs with sufficient priviledges to do its testing (and that means root priviledges).
 
-* "distro" is the distribution the slave should tell piuparts to use for basic install/purge testing. This can be left empty if only upgrade tests should be run.
+* "mirror" tells the slave which mirror it is to use. The slave gives this to piuparts when it runs it. The URLs for Packages and Sources files will be generated from this setting, too. Default (for fetching Packages/Sources): "http://cdn.debian.net/debian".
+
+* "distro" is the distribution the slave should tell piuparts to use for basic install/purge testing. No default.
+
+* "area" is the archive area to use, set to one of main, contrib, non-free. Default: "main".
+
+* "arch" is the architecture to use. Default: dpkg --print-architecture.
 
 * "chroot-tgz" is the name of the file the slave should use for the tarball to keep the chroot for the basic install/purge testing. If the tarball doesn't exist, the slave creates it. This can be left empty if only upgrade tests should be run.
 
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index c627f2b..8f1bb59 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -29,11 +29,13 @@ reschedule-fail-count = 25
 [sid]
 precedence = 1
 description = "Debian sid / main"
-# mirror = http://your.mirror.here/debian
 # packages-url = http://your.mirror.here/debian/dists/sid/main/binary-i386/Packages.bz2
 # sources-url = http://your.mirror.here/debian/dists/sid/main/source/Sources.bz2
 piuparts-cmd = sudo piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /var/tmp
+# mirror = http://cdn.debian.net/debian
 distro = sid
+# area = main
+# arch = amd64
 chroot-tgz = sid.tar.gz
 upgrade-test-distros =
 upgrade-test-chroot-tgz =
@@ -45,4 +47,7 @@ log-file = sid-master.log
 ## another example:
 ## [s-p-u-i386]
 ## packages-url = http://ftp.debian.org/debian/dists/stable-proposed-updates/binary-i386/Packages.bz2
-
+## # mirror = http://cdn.debian.net/debian
+## distro = stable-proposed-updates
+## # area = main
+## arch = i386
diff --git a/debian/changelog b/debian/changelog
index 77b3a54..989d858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,8 @@ piuparts (0.45) UNRELEASED; urgency=low
       set in the [global] section.
       The section name will be given as an argument to this command.
     - Make doc-root default to "/".
+    - New per section key: area (set to one of main, contrib, non-free).
+    - New defaults: mirror=http://cdn.debian.net/debian, area=main.
     - Removed deprecated keys: known_circular_depends.
   * master/db/report: Add a new category /affected/ for failed logs where the
     bug is in a dependency, but only exposed by the package being tested.
@@ -99,6 +101,9 @@ piuparts (0.45) UNRELEASED; urgency=low
     - Reschedule /affected/ logs like /fail/ logs.
   * piupartslib/conf.py:
     - Add support for getting default values from a special section.
+    - Add methods to get mirror, distro, area, arch from config file or
+      defaults.
+    - Add methods to compute URLs to Packages and Sources files.
   * piupartslib/packagesdb.py:
     - Do not consider a package as "untestable" if untestable/ contains a
       logfile from an obsolete version of that package.

-- 
piuparts git repository