[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-105-gac1319a

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 864539fa5223f64ec95cdce73dc9c92d81947fb3
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 09:39:46 2013 +0100

    prepare_backup: get paths from piuparts.conf
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 60624f7..647dd7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ piuparts (0.50) UNRELEASED; urgency=low
   * conf/crontab*: Substitute @sharedir@ at build time.
   * known_problems: Install to @sharedir@/piuparts/known_problems/.
   * Replace all remaining references to $HOME/bin and ~/bin with @sharedir at .
+  * prepare_backup:
+    - Get paths from piuparts.conf.
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
   * pre_remove_50_find_bad_permissions: Add some exceptions.
diff --git a/master-bin/prepare_backup.in b/master-bin/prepare_backup.in
index 66e3301..5232d23 100755
--- a/master-bin/prepare_backup.in
+++ b/master-bin/prepare_backup.in
@@ -17,13 +17,6 @@ set -e
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-
-. @sharedir@/piuparts/lib/read_config.sh
-
-get_config_value MASTER global master-directory
-get_config_value SECTIONS global sections
-
-
 #
 # backup statistiscs files to a single directory for DSA to backup
 # piuparts.d.o's state is not backupped
@@ -31,8 +24,17 @@ get_config_value SECTIONS global sections
 #         which produces a gigabyte of logfiles to be saved, for basically
 #         not much value)
 #
-BACKUPDIR=/org/piuparts.debian.org/backup
-HTDOCS=/org/piuparts.debian.org/htdocs
+
+
+. @sharedir@/piuparts/lib/read_config.sh
+
+get_config_value SECTIONS global sections
+get_config_value MASTER global master-directory
+get_config_value HTDOCS global output-directory
+get_config_value BACKUPDIR global backup-directory ''
+
+
+test -n "$BACKUPDIR" || exit 0
 
 for SECTION in $SECTIONS ; do
 	if [ -f $HTDOCS/$SECTION/counts.txt ]; then

-- 
piuparts git repository