r2798 - in dists/trunk/live-helper: debian docs helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-28 18:34:04 +0000 (Tue, 28 Aug 2007)
New Revision: 2798

Modified:
   dists/trunk/live-helper/debian/changelog
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/helpers/lh_clean
Log:


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-08-26 12:31:52 UTC (rev 2797)
+++ dists/trunk/live-helper/debian/changelog	2007-08-28 18:34:04 UTC (rev 2798)
@@ -1,6 +1,8 @@
-live-helper (1.0~a24-1) UNRELEASED; urgency=medium
+live-helper (1.0~a24-1) unstable; urgency=medium
 
-  * New upstream release.
+  * New upstream release:
+    - lh_clean accepts more than one argument at the same time
+      (Closes: #439947).
 
  -- Daniel Baumann <daniel at debian.org>  Mon, 20 Aug 2007 00:00:00 +0200
 

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-08-26 12:31:52 UTC (rev 2797)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-08-28 18:34:04 UTC (rev 2798)
@@ -1,3 +1,8 @@
+2007-08-28  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_clean:
+	  - Accepting more than one parameter at the same time.
+
 2007-08-14  Daniel Baumann  <daniel at debian.org>
 
 	* helpers/*:

Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean	2007-08-26 12:31:52 UTC (rev 2797)
+++ dists/trunk/live-helper/helpers/lh_clean	2007-08-28 18:34:04 UTC (rev 2798)
@@ -35,81 +35,84 @@
 
 rm -f .lock
 
-case "${1}" in
-	all)
-		"${0}" chroot
-		"${0}" binary
-		"${0}" stage
-		"${0}" source
+for ARGUMENT in ${@}
+do
+	case "${ARGUMENT}" in
+		all)
+			"${0}" chroot
+			"${0}" binary
+			"${0}" stage
+			"${0}" source
 
-		if [ -d chroot ]
-		then
-			mkdir -p .stage
-			touch .stage/bootstrap
-		fi
-		;;
+			if [ -d chroot ]
+			then
+				mkdir -p .stage
+				touch .stage/bootstrap
+			fi
+			;;
 
-	cache)
-		${LH_ROOT_COMMAND} rm -rf cache
-		;;
+		cache)
+			${LH_ROOT_COMMAND} rm -rf cache
+			;;
 
-	chroot)
-		Echo_message "Cleaning chroot"
-		${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
-		${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
-		${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
-		${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
-		${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
-		${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
-		${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
+		chroot)
+			Echo_message "Cleaning chroot"
+			${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
 
-		${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
+			${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
 
-		if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
-		then
-			${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
-			mkdir -p .stage
-			touch .stage/bootstrap
-		fi
+			if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ]
+			then
+				${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+				mkdir -p .stage
+				touch .stage/bootstrap
+			fi
 
-		rm -f .stage/chroot*
-		;;
+			rm -f .stage/chroot*
+			;;
 
-	binary)
-                ${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
-		rm -rf binary.tmp binary.deb binary.udeb
-		rm -f binary.iso
-		rm -f binary.img
-		rm -f binary*.tar.gz
-		rm -f binary.sh
+		binary)
+	                ${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
+			rm -rf binary.tmp binary.deb binary.udeb
+			rm -f binary.iso
+			rm -f binary.img
+			rm -f binary*.tar.gz
+			rm -f binary.sh
 
-		rm -rf binary
-		rm -rf tftpboot
+			rm -rf binary
+			rm -rf tftpboot
 
-		rm -f .stage/binary*
-		;;
+			rm -f .stage/binary*
+			;;
 
-	purge)
-		PURGE="true" "${0}" all
-		"${0}" cache
-		;;
+		purge)
+			PURGE="true" "${0}" all
+			"${0}" cache
+			;;
 
-	stage)
-		rm -rf .stage
-		;;
+		stage)
+			rm -rf .stage
+			;;
 
-	source)
-		rm -f source.iso
-		rm -f source.img
-		rm -f source*.tar
-		rm -f source*.tar.gz
+		source)
+			rm -f source.iso
+			rm -f source.img
+			rm -f source*.tar
+			rm -f source*.tar.gz
 
-		rm -rf source
+			rm -rf source
 
-		rm -f .stage/source*
-		;;
+			rm -f .stage/source*
+			;;
 
-	*)
-		"${0}" all
-		;;
-esac
+		*)
+			"${0}" all
+			;;
+	esac
+done