[Piuparts-commits] rev 419 - piatti/org/piuparts.debian.org/etc trunk

[Holger Levsen]

Author: holger
Date: 2009-05-26 23:16:03 +0000 (Tue, 26 May 2009)
New Revision: 419

Modified:
   piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
   piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
   trunk/README.txt
   trunk/TODO
Log:
dont use components with "mirror" setting in .conf...

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2009-05-26 22:59:09 UTC (rev 418)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.goldwasser	2009-05-26 23:16:03 UTC (rev 419)
@@ -17,7 +17,7 @@
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master sid
 packages-url = http://ftp.de.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/sid/main/source/Sources.bz2
-mirror = "http://ftp.de.debian.org/debian/ main"
+mirror = http://ftp.de.debian.org/debian/
 piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = sid
 chroot-tgz = sid.tar.gz
@@ -31,7 +31,7 @@
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master squeeze
 packages-url = http://ftp.de.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/squeeze/main/source/Sources.bz2
-mirror = "http://ftp.de.debian.org/debian/ main"
+mirror = http://ftp.de.debian.org/debian/
 piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz

Modified: piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti
===================================================================
--- piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2009-05-26 22:59:09 UTC (rev 418)
+++ piatti/org/piuparts.debian.org/etc/piuparts.conf.piatti	2009-05-26 23:16:03 UTC (rev 419)
@@ -16,7 +16,7 @@
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master sid
 packages-url = http://piatti.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/sid/main/source/Sources.bz2
-mirror = "http://piatti.debian.org/debian/ main"
+mirror = http://piatti.debian.org/debian/
 piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = sid
 chroot-tgz = sid.tar.gz
@@ -30,7 +30,7 @@
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master squeeze
 packages-url = http://piatti.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/squeeze/main/source/Sources.bz2
-mirror = "http://piatti.debian.org/debian/ main"
+mirror = http://piatti.debian.org/debian/
 piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz

Modified: trunk/README.txt
===================================================================
--- trunk/README.txt	2009-05-26 22:59:09 UTC (rev 418)
+++ trunk/README.txt	2009-05-26 23:16:03 UTC (rev 419)
@@ -373,7 +373,7 @@
  
 * "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.
+* "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).
   

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009-05-26 22:59:09 UTC (rev 418)
+++ trunk/TODO	2009-05-26 23:16:03 UTC (rev 419)
@@ -18,6 +18,8 @@
 
 for 0.37 and 0.38 (split this list):
 
+- remove configfile option "mirror" and use the mirror from "packages-url".
+
 - probably include patch for #523950
 - probably include patch for #519192 - not sure if i like that aproach