[Piuparts-commits] rev 887 - in piatti/home: piupartsm/bin piupartss/bin

[Holger Levsen]

Author: holger
Date: 2011-02-16 18:43:13 +0000 (Wed, 16 Feb 2011)
New Revision: 887

Modified:
   piatti/home/piupartsm/bin/detect_archive_issues
   piatti/home/piupartsm/bin/detect_network_issues
   piatti/home/piupartsm/bin/detect_piuparts_issues
   piatti/home/piupartsm/bin/detect_slave_problems
   piatti/home/piupartsm/bin/detect_well_known_errors
   piatti/home/piupartss/bin/detect_leftover_processes
   piatti/home/piupartss/bin/slave_run
   piatti/home/piupartss/bin/update-piuparts-setup
Log:
exit cleanly, if config doesnt exist

Modified: piatti/home/piupartsm/bin/detect_archive_issues
===================================================================
--- piatti/home/piupartsm/bin/detect_archive_issues	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartsm/bin/detect_archive_issues	2011-02-16 18:43:13 UTC (rev 887)
@@ -20,6 +20,7 @@
 # parse config file
 #
 
+[ -e /etc/piuparts/piuparts.conf ] || exit 0
 TEMPFILE=`mktemp`
 egrep "(^sections|^master-directory)" /etc/piuparts/piuparts.conf| sed -e "s# =#=#g" -e "s#= #=#g" -e 's#=#="#' -e 's#$#"#' -e "s#sections#SECTIONS#" -e "s#master-directory#MASTER#" > $TEMPFILE
 source $TEMPFILE

Modified: piatti/home/piupartsm/bin/detect_network_issues
===================================================================
--- piatti/home/piupartsm/bin/detect_network_issues	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartsm/bin/detect_network_issues	2011-02-16 18:43:13 UTC (rev 887)
@@ -20,6 +20,7 @@
 # parse config file
 #
 
+[ -e /etc/piuparts/piuparts.conf ] || exit 0
 TEMPFILE=`mktemp`
 egrep "(^sections|^master-directory)" /etc/piuparts/piuparts.conf| sed -e "s# =#=#g" -e "s#= #=#g" -e 's#=#="#' -e 's#$#"#' -e "s#sections#SECTIONS#" -e "s#master-directory#MASTER#" > $TEMPFILE
 source $TEMPFILE

Modified: piatti/home/piupartsm/bin/detect_piuparts_issues
===================================================================
--- piatti/home/piupartsm/bin/detect_piuparts_issues	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartsm/bin/detect_piuparts_issues	2011-02-16 18:43:13 UTC (rev 887)
@@ -20,6 +20,7 @@
 # parse config file
 #
 
+[ -e /etc/piuparts/piuparts.conf ] || exit 0
 TEMPFILE=`mktemp`
 egrep "(^sections|^master-directory)" /etc/piuparts/piuparts.conf| sed -e "s# =#=#g" -e "s#= #=#g" -e 's#=#="#' -e 's#$#"#' -e "s#sections#SECTIONS#" -e "s#master-directory#MASTER#" > $TEMPFILE
 source $TEMPFILE

Modified: piatti/home/piupartsm/bin/detect_slave_problems
===================================================================
--- piatti/home/piupartsm/bin/detect_slave_problems	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartsm/bin/detect_slave_problems	2011-02-16 18:43:13 UTC (rev 887)
@@ -25,6 +25,7 @@
 # parse config file
 #
 
+[ -e /etc/piuparts/piuparts.conf ] || exit 0
 TEMPFILE=`mktemp`
 egrep "(^sections|^master-directory)" /etc/piuparts/piuparts.conf| sed -e "s# =#=#g" -e "s#= #=#g" -e 's#=#="#' -e 's#$#"#' -e "s#sections#SECTIONS#" -e "s#master-directory#MASTER#" > $TEMPFILE
 source $TEMPFILE

Modified: piatti/home/piupartsm/bin/detect_well_known_errors
===================================================================
--- piatti/home/piupartsm/bin/detect_well_known_errors	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartsm/bin/detect_well_known_errors	2011-02-16 18:43:13 UTC (rev 887)
@@ -20,6 +20,7 @@
 # parse config file
 #
 
+[ -e /etc/piuparts/piuparts.conf ] || exit 0
 TEMPFILE=`mktemp`
 egrep "(^sections|^master-directory)" /etc/piuparts/piuparts.conf| sed -e "s# =#=#g" -e "s#= #=#g" -e 's#=#="#' -e 's#$#"#' -e "s#sections#SECTIONS#" -e "s#master-directory#MASTER#" > $TEMPFILE
 source $TEMPFILE

Modified: piatti/home/piupartss/bin/detect_leftover_processes
===================================================================
--- piatti/home/piupartss/bin/detect_leftover_processes	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartss/bin/detect_leftover_processes	2011-02-16 18:43:13 UTC (rev 887)
@@ -20,6 +20,7 @@
 # parse config file
 #
 
+[ -e /etc/piuparts/piuparts.conf ] || exit 0
 TEMPFILE=`mktemp`
 egrep "(^sections|^master-directory)" /etc/piuparts/piuparts.conf| sed -e "s# =#=#g" -e "s#= #=#g" -e 's#=#="#' -e 's#$#"#' -e "s#sections#SECTIONS#" -e "s#master-directory#MASTER#" > $TEMPFILE
 source $TEMPFILE

Modified: piatti/home/piupartss/bin/slave_run
===================================================================
--- piatti/home/piupartss/bin/slave_run	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartss/bin/slave_run	2011-02-16 18:43:13 UTC (rev 887)
@@ -23,6 +23,7 @@
 
 SCREENLOG=/org/piuparts.debian.org/slave/screenlog.0
 MONITORDIR=/org/piuparts.debian.org/master/monitor-slave
+export PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/site-packages
 
 cd /org/piuparts.debian.org/slave
 (ps fax|grep -v grep| grep piuparts-slave ) && exit 0

Modified: piatti/home/piupartss/bin/update-piuparts-setup
===================================================================
--- piatti/home/piupartss/bin/update-piuparts-setup	2011-02-16 16:14:38 UTC (rev 886)
+++ piatti/home/piupartss/bin/update-piuparts-setup	2011-02-16 18:43:13 UTC (rev 887)
@@ -38,10 +38,6 @@
 crontab crontab
 svn up
 svn status
-grep -q PYTHONPATH .bashrc || {
-	echo PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/site-packages >> .bashrc
-	echo export PYTHONPATH >> .bashrc
-}
 
 #
 # update master home, that's mostly crontab to run piuparts-reports
@@ -55,10 +51,6 @@
 fi
 sudo su - piupartsm -c "pwd ; svn up ; svn status"
 sudo su - piupartsm -c "crontab crontab"
-grep -q PYTHONPATH ~piupartsm/.bashrc || {
-	echo PYTHONPATH=/org/piuparts.debian.org/lib/python2.5/site-packages:/org/piuparts.debian.org/lib/python2.6/site-packages >> ~piupartsm/.bashrc
-	echo export PYTHONPATH >> ~piupartsm/.bashrc
-}
 
 
 #