[Piuparts-commits] [SCM] piatti.debian.org configuration files branch, develop, updated. bd576b4d2a7b962aad4245414b3a858dec5e52c6

Andreas Beckmann debian at abeckmann.de
Fri Dec 2 13:15:15 UTC 2011


The following commit has been merged in the develop branch:
commit e36f816d75b14c86cb16fb7dc92d7278a5ac51f1
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu Dec 1 00:35:50 2011 +0100

    allow customizing the tempdir
    
    [global]
    tempdir = /org/piuparts.debian.org/tmp
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/home/piupartsm/bin/detect_stale_mounts b/home/piupartsm/bin/detect_stale_mounts
index e35e9b5..24e73dd 100755
--- a/home/piupartsm/bin/detect_stale_mounts
+++ b/home/piupartsm/bin/detect_stale_mounts
@@ -36,16 +36,16 @@ get_config_value()
 	eval "$1"='"$value"'
 }
 
-get_config_value MASTER global master-directory
+get_config_value PIUPARTS_TEMPDIR global tempdir /org/piuparts.debian.org/tmp
 
 
 FILE=`mktemp`
 cp /proc/mounts $FILE
 
-if [ "$(grep -v trash $FILE | grep -c /org/piuparts.debian.org/tmp )" -gt 1 ] ; then 
-	echo "More than one mountpoint below /org/piuparts.debian.org/tmp detected!"
+if [ "$(grep -v trash $FILE | grep -c $PIUPARTS_TEMPDIR )" -gt 1 ] ; then
+	echo "More than one mountpoint below $PIUPARTS_TEMPDIR detected!"
 	echo
-	grep /org/piuparts.debian.org/tmp $FILE
+	grep $PIUPARTS_TEMPDIR $FILE
 	echo
 	echo "Zero or one mountpoint is normal for piuparts operation, more is not."
 	echo "Please investigate and cleanup."
diff --git a/home/piupartsm/bin/detect_tmp_cruft b/home/piupartsm/bin/detect_tmp_cruft
index 8f3c4b6..7c69c53 100755
--- a/home/piupartsm/bin/detect_tmp_cruft
+++ b/home/piupartsm/bin/detect_tmp_cruft
@@ -36,12 +36,12 @@ get_config_value()
 	eval "$1"='"$value"'
 }
 
-get_config_value MASTER global master-directory
+get_config_value PIUPARTS_TEMPDIR global tempdir /org/piuparts.debian.org/tmp
 
 
-LS_TMP=$(ls --color=never -l /org/piuparts.debian.org/tmp)
+LS_TMP=$(ls --color=never -l $PIUPARTS_TEMPDIR)
 if [ "$(echo "$LS_TMP" | wc -l)" -gt 12 ] ; then 
-	echo "More than ten directories in /org/piuparts.debian.org/tmp detected!"
+	echo "More than ten directories in $PIUPARTS_TEMPDIR detected!"
 	echo
 	echo "$LS_TMP"
 	echo

-- 
piatti.debian.org configuration files



More information about the Piuparts-commits mailing list