[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.49-194-g6f9dd07

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit e8ffd6e6e50d94c532b714f641bf0243d2c5d238
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Mar 9 16:07:45 2013 +0100

    documentation updates
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README.txt b/README.txt
index 3ee391e..375035b 100644
--- a/README.txt
+++ b/README.txt
@@ -637,47 +637,66 @@ section, too, and will serve as defaults for all other sections
  piuparts itself currently always produces debug output and there
  is no way to disable that.
 
-Some of the configuration items are not required, but it is best
-to set them all to be sure what the configuration actually is.
-
-==== piuparts.debian.org specific configuration
-
-In addition to some of the above settings the following
-configuration settings are used by the scripts in '~piuparts?/bin/'
-used to run piuparts.debian.org. They are all optional, default
-values are set in the scripts.
-
 * "PYTHONPATH" (global) sets the search path to the piupartslib
  python modules if they are not installed in their default location
  in /usr.
 
-* "urlbase" (global) is the base url of the webserver serving this
- piuparts instance. Used to provide links to logfiles in email
- reports.
-
 * "reschedule-untestable-days" (global) sets the rescheduling
  delay for untestable packages (e.g. due to unsatisfied
- dependencies).
+ dependencies). This is handled by the 'report_untestable_packages'
+ script and the default is "7" days.
 
 * "reschedule-old-days" (global, section) and the following five
- settings define the rescheduling scheme for passed and failed
- packages. Logs that are marked for recycling but are older than
- expire-(old|fail)-days will be deleted, moving the package to
- dependency-failed-testing state. expire-(old|fail)-days needs to
- be greater than reschedule-(old|fail)-days to enable expiration.
+ settings define the rescheduling scheme that it performed by the
+ 'reschedule_oldest_logs' script. Passed/failed logs that are
+ older than reschedule-(old|fail)-days will be marked for
+ rechecking (limited to reschedule-(old|fail)-count). Only packages
+ that are actually testable will be reissued by piuparts-master (and
+ the "old" log will be deleted at that time).  Logs that are marked
+ for recycling but have not been rechecked due to missing/failing
+ dependecies will be deleted anyway if they are older than
+ expire-(old|fail)-days.
+
+* "reschedule-old-count" (global, section) is the maximum number of
+ passed logs that will be marked for recycling. Set to 0 to disable
+ rescheduling passed logs.
+
+* "expire-old-days" (global, section) can be set to a value larger
+ than 'reschedule-old-days' to delete logs older than the setting
+ that are marked for recycling but haven't been rechecked due to
+ failing or missing dependecies. Disabled by default ("0").
+
+* "reschedule-fail-days" (global, section) sets the minimum age of
+ failing logs (fail/*.log or affected/*.log) before they will be
+ rechecked.
+
+* "reschedule-fail-count" (global, section) is the maximum number
+ of failed logs that will be marked for recycling. Set to 0 to
+ disable rescheduling failed logs.
+
+* "expire-fail-days" (global, section) can be set to a value larger
+ than 'reschedule-fail-days' to delete logs older than the setting
+ that are marked for recycling but haven't been rechecked due to
+ failing or missing dependecies. Disabled by default ("0").
 
-* "reschedule-old-count" (global, section)
-
-* "reschedule-fail-days" (global, section)
+* "auto-reschedule" (section) can be set to "no" to disable
+ rescheduling of passed and failed packages. To disable only
+ rescheduling one of passed or failed logs, set the corresponding
+ -count variable to zero.
 
-* "reschedule-fail-count" (global, section)
+Some of the configuration items are not required, but it is best
+to set them all to be sure what the configuration actually is.
 
-* "expire-old-days" (global, section)
+==== piuparts.debian.org specific configuration
 
-* "expire-fail-days" (global, section)
+In addition to some of the above settings the following
+configuration settings are used by the scripts in '~piuparts?/bin/'
+used to run piuparts.debian.org. They are all optional, default
+values are set in the scripts.
 
-* "auto-reschedule" (section) can be set to "no" to disable
- rescheduling of passed and failed packages.
+* "urlbase" (global) is the base url of the webserver serving this
+ piuparts instance. Used to provide links to logfiles in email
+ reports.
 
 
 === Running piuparts in master-slave mode, piuparts-report and the setup on piuparts.debian.org
diff --git a/debian/changelog b/debian/changelog
index f1c58b9..64b8022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,7 +93,8 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Get paths from piuparts.conf.
     - Prepare a copy of submissions.txt, too.
   * master-bin/slave-bin: Use PYTHONPATH from piuparts.conf.
-  * piuparts-slave.deb: Use /var/cache/piuparts/tmp as tmpdir.
+  * piuparts-slave.deb:
+    - Use /var/cache/piuparts/tmp as tmpdir.
     - Use /var/cache/piuparts/basetgz as basetgz-directory.
   * slave_{run,join}: Rename the screen session to "piuparts_slave_screen".
   * slave_cleanup: Use pgrep to find running piuparts-slave processes.
diff --git a/known_problems/db_setup_error.conf b/known_problems/db_setup_error.conf
index 57d922b..1634165 100644
--- a/known_problems/db_setup_error.conf
+++ b/known_problems/db_setup_error.conf
@@ -4,7 +4,7 @@
 COMMAND='grep -E "(dbconfig-common: .* configure: aborted.|updating database schema for .*...command failed with code 0|psql: could not connect to server: No such file or directory|DBI connect.* failed: could not connect to server|pg_pconnect\(\): Unable to connect to PostgreSQL server|Unable to connect to MySQL server|unable to connect to mysql server)"'
 WHERE='fail bugged affected'
 ISSUE=0
-HEADER='Packages with failed logs because installation failed because no database could be conected.'
+HEADER='Packages with failed logs because installation failed because no database could be connected.'
 HELPTEXT='
 <p>
 Just how buggy these packages really are is discussed in <a href="http://bugs.debian.org/595652" target=_blank>#595652</a> at the moment.

-- 
piuparts git repository