From 9afe5dec0e21122bd81941f420c987da48173559 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 16 Nov 2013 15:19:17 -0500
Subject: makechrootpkg.sh: The delete message always said 'temporary copy'

---
 src/chroot-tools/makechrootpkg.sh.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/chroot-tools/makechrootpkg.sh.patch')

diff --git a/src/chroot-tools/makechrootpkg.sh.patch b/src/chroot-tools/makechrootpkg.sh.patch
index 4082bdd..4dd1146 100644
--- a/src/chroot-tools/makechrootpkg.sh.patch
+++ b/src/chroot-tools/makechrootpkg.sh.patch
@@ -1,5 +1,5 @@
---- makechrootpkg.sh.in	2013-10-15 21:33:17.000000000 -0400
-+++ makechrootpkg.sh.ugly	2013-10-25 19:05:08.000000000 -0400
+--- makechrootpkg.sh.in	2013-10-26 14:53:57.000000000 -0400
++++ makechrootpkg.sh.ugly	2013-11-16 15:14:04.000000000 -0500
 @@ -12,6 +12,7 @@
  
  shopt -s nullglob
@@ -92,7 +92,7 @@
  		# Get a read lock on the root chroot to make
  		# sure we don't clone a half-updated chroot
  		slock 8 "$chrootdir/root.lock" "Locking clean chroot"
-@@ -154,10 +171,15 @@
+@@ -154,11 +171,16 @@
  
  		# Drop the read lock again
  		lock_close 8
@@ -100,6 +100,7 @@
  }
  
 -clean_temporary() {
+-	stat_busy "Removing temporary copy [%s]" "$copy"
 +# Usage: delete_chroot $copydir [$copy]
 +delete_chroot() {
 +	local copydir=$1
@@ -107,9 +108,10 @@
 +	# Detect chrootdir filesystem type
 +	local chroottype=$(stat -f -c %T "$copydir")
 +
- 	stat_busy "Removing temporary copy [%s]" "$copy"
++	stat_busy "Removing chroot copy [%s]" "$copy"
  	if [[ "$chroottype" == btrfs ]]; then
  		btrfs subvolume delete "$copydir" >/dev/null ||
+ 			die "Unable to delete subvolume %s" "$copydir"
 @@ -173,9 +195,14 @@
  	stat_done
  }
-- 
cgit v1.2.3