[SCM] live-build branch, debian, updated. debian/3.0_a51-1

Daniel Baumann daniel at debian.org
Wed Jun 27 12:39:12 UTC 2012


The following commit has been merged in the debian branch:
commit 060a94eb0934541f6e349b36004389bccabbc73e
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 25 20:10:50 2012 +0200

    Redirecting rmdir output in postrm for live-build-cron properly (Closes: #676102).

diff --git a/debian/live-build-cron.postrm b/debian/live-build-cron.postrm
index ea395e2..c457cf8 100644
--- a/debian/live-build-cron.postrm
+++ b/debian/live-build-cron.postrm
@@ -6,19 +6,19 @@ case "${1}" in
 	purge)
 		# images
 		rm -f /etc/live/build-cron.d/images.conf
-		rmdir --ignore-fail-on-non-empty /etc/live/build-cron.d 2>&1 || true
-		rmdir --ignore-fail-on-non-empty /etc/live 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/live/build-cron.d > /dev/null 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/live > /dev/null 2>&1 || true
 
 		rm -f /etc/cron.d/live-build-cron-manual
-		rmdir --ignore-fail-on-non-empty /etc/cron.d 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/cron.d > /dev/null 2>&1 || true
 
 		# manual
 		rm -f /etc/live/build-cron.d/manual.conf
-		rmdir --ignore-fail-on-non-empty /etc/live/build-cron.d 2>&1 || true
-		rmdir --ignore-fail-on-non-empty /etc/live 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/live/build-cron.d > /dev/null 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/live > /dev/null 2>&1 || true
 
 		rm -f /etc/cron.d/live-build-cron-images
-		rmdir --ignore-fail-on-non-empty /etc/cron.d 2>&1 || true
+		rmdir --ignore-fail-on-non-empty /etc/cron.d > /dev/null 2>&1 || true
 		;;
 
 	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

-- 
live-build



More information about the debian-live-changes mailing list