[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-780-ga363455

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 8af3134b441c037bc352c918a09ce729331f3691
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 2 16:03:38 2012 +0200

    remove documentation of packages-url, sources-url
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/README.txt b/README.txt
index 36a35bf..ed0a9a9 100644
--- a/README.txt
+++ b/README.txt
@@ -437,10 +437,6 @@ section, too, and will serve as defaults for all other sections
 
 * "log-file" is the name of a file to where the master should write its log messages. In the default configuration file it is "/dev/null", that is, log messages are not put in a file.
 
-* "packages-url" is a URL to the Packages.bz2 file specifying what packages should be tested. This needs to be a Packages.bz2 file, other compression methods are not supported. For example, you might use 'http://ftp.debian.org/debian/dists/sid/main/binary-i386/Packages.bz2' but you really do want to replace "ftp.debian.org" with the name of your local mirror.
-
-* "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.
-
 * "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).
 
 * "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".
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 8f1bb59..2784205 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -4,8 +4,8 @@
 # The sample file does not set all required values, to prevent the
 # master from being run accidentally.
 #
-# You MUST make sure that master-host, master-user, master-directory, mirror
-# and packages-url are also set correctly. The sample file does not set it at
+# You MUST make sure that master-host, master-user, master-directory, and
+# mirror are also set correctly. The sample file does not set it at
 # all, to prevent the master from being run accidentally.
 #
 #
@@ -29,8 +29,6 @@ reschedule-fail-count = 25
 [sid]
 precedence = 1
 description = "Debian sid / main"
-# 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
@@ -46,7 +44,6 @@ 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
diff --git a/debian/changelog b/debian/changelog
index 989d858..3dc8dec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,7 +90,9 @@ piuparts (0.45) UNRELEASED; urgency=low
     - 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.
+    - Compute URLs from mirror, distro, area, arch.
+    - Removed deprecated keys: known_circular_depends, packages-url,
+      sources-url.
   * 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.
     - In the BTS these are reported as          (Closes: #657740)

-- 
piuparts git repository