[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 487654ec7664271639344461e7d926a19389db55
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sun Nov 27 16:30:25 2011 +0100

    README and TODO updates

diff --git a/README.txt b/README.txt
index 4162c30..b5f1292 100644
--- a/README.txt
+++ b/README.txt
@@ -352,29 +352,29 @@ this:
 
 ==== global configuration
 
-These settings are used for all sections. Except for the first
-three they are all mandatory:
+These settings have to be placed in the [global] section and are
+used for all further sections.
 
 * "sections" defaults to sid and defines which sections should be processed in master-slave mode. Each section defined here has to have a section with the section specific settings explained below. The first section defined should always be sid, because the data from first section a package is in is used for the source package html report.
 
+* "master-host" is the host where the master exists. The slave will give this host to ssh. This option is mandatory.
+
+* "master-user" is the username of the master. The slave will log in using this username. This option is mandatory.
+
+* "master-directory" is the directory where the master keeps its files. Can be relative to the master's home directory.
+
 * "idle-sleep" is the length of time the slave should wait before querying the master again if the master didn't have any new packages to test. In seconds, so a value of 300 would mean five minutes, and that seems to be a good value when there are fairly few slaves per master. The default is 300 seconds.
 
 * "max-tgz-age" is used to specify the maximum age (in seconds) after which basesystem tarballs will be recreated. If recreation fails, the old tarball will be used again. The default is 2592000 seconds, which is 30 days.
 
 * "min-tgz-retry-delay" is used to specify the minimum time (in seconds) between attempts to recreate a tarball which was created more than "max-tgz-age" seconds ago. The default is 21600 seconds, which is 6h.
 
-* "master-host" is the host where the master exists. The slave will give this host to ssh.
-
-* "master-user" is the username of the master. The slave will log in using this username.
-
-* "master-directory" is the directory where the master keeps its files. Can be relative to the master's home directory.
+==== section specific configuration
 
 * "master-command" is the command to run on master-host to start the master. When the master has been installed from the Debian package, the command is 'python /usr/share/piuparts/piuparts-master'.  If you want to use a section in the master configuration file other than "master", append the section name to this command.  For example, if the master configuration file has a "sid-ia64" section that you want to use, the command should be 'python /usr/share/piuparts/piuparts-master sid-ia64'.
 
 * "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.
 
-==== section specific configuration 
-
 * "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.
@@ -407,4 +407,4 @@ If you want to run piuparts-report (which is only+very useful if
 you run piuparts in master-slave mode), you need to 'apt-get
 install python-rpy r-recommended r-base-dev'. For more
 information see
-link:http://svn.debian.org/viewsvn/piuparts/piatti/README.txt?view=markup[svn://svn.debian.org/svn/piuparts/piatti/README.txt].
+link:http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob_plain;f=README.txt;hb=piatti[http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob_plain;f=README.txt;hb=piatti].
diff --git a/TODO b/TODO
index 99d4200..05741f3 100644
--- a/TODO
+++ b/TODO
@@ -155,3 +155,9 @@ Low priority stuff (a.k.a. "nobody's said they must have it now")
 - create emacspeak-broken-dpkg-preconfigure package for broken
   repo. (then later put more broken packages in there and use
   that for testing piuparts)
+
+- read circular depends from /etc/piuparts/circular-depends-*.txt
+  instead of having this infinite string in the config file
+  filename should be configurable, e.g.
+  [section]/circular-depends-file
+
diff --git a/piuparts-report.py b/piuparts-report.py
index f5a8ef2..8c4da95 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -1074,6 +1074,7 @@ def main():
     section_names = []
     if len(sys.argv) > 1:
         section = sys.argv[1]
+        # FIXME: does this work without settings master_directory and output_directory?
     else:
         global_config = Config(section="global")
         global_config.read(CONFIG_FILE)
diff --git a/piuparts-slave.py b/piuparts-slave.py
index f0e430c..a85b502 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -93,7 +93,7 @@ def alarm_handler(signum, frame):
 class MasterNotOK(Exception):
 
     def __init__(self):
-        self.args = "Master did not responed with 'ok'"
+        self.args = "Master did not respond with 'ok'"
 
 
 class MasterDidNotGreet(Exception):

-- 
piuparts git repository