[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.46-27-g960eea7

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 4d831014d58d3cf051502d7a9f63632fee59bad9
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Sep 15 12:13:31 2012 +0200

    reschedule_oldest_logs: support global auto-reschedule=no
    
    to disable recycling with a single change
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 7a3db99..fb58319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ piuparts (0.47) UNRELEASED; urgency=low
   * Remove post_purge_dbconfig_cleanup custom script.
   * reschedule_oldest_logs: Refactored.
     - Fix duplicate variable name usage that soemetimes prevented recycling.
+    - Support a [global] auto-reschedule=no setting.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 15 Sep 2012 06:25:05 +0200
 
diff --git a/master-bin/reschedule_oldest_logs b/master-bin/reschedule_oldest_logs
index 621f33a..13c9fc9 100755
--- a/master-bin/reschedule_oldest_logs
+++ b/master-bin/reschedule_oldest_logs
@@ -48,6 +48,8 @@ get_config_value COUNT      global reschedule-old-count 200
 get_config_value FAIL_AGE   global reschedule-fail-days 30
 get_config_value FAIL_COUNT global reschedule-fail-count 25
 
+get_config_value AUTO_RESCHEDULE	global auto-reschedule yes
+
 TOTAL=0
 UNSCHEDULE=0
 LOGS=`mktemp`
@@ -69,7 +71,7 @@ for SECTION in $SECTIONS ; do
 
 	# Reschedule old logs
 	>$LOGS
-	get_config_value RESCHEDULE $SECTION auto-reschedule yes
+	get_config_value RESCHEDULE $SECTION auto-reschedule $AUTO_RESCHEDULE
 	if [ "$RESCHEDULE" = "yes" ]; then
 		get_config_value _AGE        $SECTION reschedule-old-days $AGE
 		get_config_value _COUNT      $SECTION reschedule-old-count $COUNT

-- 
piuparts git repository