[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-69-g53033af

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 8e9b885b07ad34f57c67e030cc043eb62e656a85
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Feb 20 19:11:24 2013 +0100

    lib/read_config.sh: get_config_value() used by all master/slave scripts
    
    factored out the shell function currently embedded in {master,slave}-bin/*
    installed as $prefix/share/piuparts/lib/read_config.sh
    shipped in piuparts-common.deb
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/Makefile b/Makefile
index 30f1cb7..e012d7f 100644
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,9 @@ install:
 	install -m 0644 piupartslib/*.py $(DESTDIR)$(site26)/piupartslib/
 	install -m 0644 piupartslib/*.py $(DESTDIR)$(site27)/piupartslib/
 
+	install -d $(DESTDIR)$(sharedir)/piuparts/lib
+	install -m 0644 lib/*.sh $(DESTDIR)$(sharedir)/piuparts/lib/
+
 	install -d $(DESTDIR)$(sharedir)/piuparts/master
 	install -m 0755 master-bin/* $(DESTDIR)$(sharedir)/piuparts/master
 
diff --git a/debian/changelog b/debian/changelog
index f3faaa0..0eddf05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ piuparts (0.50) UNRELEASED; urgency=low
     - Add DESTDIR support.
     - Perform syntax check on *.py before installation.
   * debian/rules: Set 'prefix' and 'DESTDIR' for build and install.
+  * lib/read_config.sh: Factored out the piuparts.conf reading function that
+    is used by all master/slave shell scripts. Shipped in piuparts.common.
   * 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/debian/piuparts-common.install b/debian/piuparts-common.install
index f1d0181..1ee1aa0 100644
--- a/debian/piuparts-common.install
+++ b/debian/piuparts-common.install
@@ -1 +1,2 @@
 usr/lib/*
+usr/share/piuparts/lib/*
diff --git a/master-bin/master_cleanup b/lib/read_config.sh
old mode 100755
new mode 100644
similarity index 76%
copy from master-bin/master_cleanup
copy to lib/read_config.sh
index f138482..6a43692
--- a/master-bin/master_cleanup
+++ b/lib/read_config.sh
@@ -1,7 +1,4 @@
-#!/bin/sh
-set -e
-
-# Copyright © 2012 Andreas Beckmann <debian at abeckmann.de>
+# Copyright © 2011 Andreas Beckmann <debian at abeckmann.de>
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -18,9 +15,8 @@ set -e
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 #
-# cleanup $HTDOCS/daily.lock
-#
-# - this should only be run (automatically) on boot
+# Helper function for getting values from piuparts.conf.
+# Used by several master and slave scripts.
 #
 
 
@@ -42,15 +38,3 @@ get_config_value()
 	fi
 	eval "$1"='"$value"'
 }
-
-get_config_value HTDOCS global output-directory
-
-
-LOCKFILE=$HTDOCS/daily.lock
-if [ -e $LOCKFILE ]; then
-	if pgrep -f generate_daily_report || pgrep -f piuparts-report ; then
-		echo "daily processing is running"
-	else
-		rm -f -v $LOCKFILE
-	fi
-fi

-- 
piuparts git repository