summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 11:05:01 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-24 11:05:01 -0400
commit1736c182635da653babe2ec607a41294fdd5aacf (patch)
tree4b30eccf390373f620dd72c5f5ffea43c2547c0c
parent7eadec0ab1c0c09c4d940b20d6f88f81a4ab149e (diff)
parentb807c51102685bc07f39216ecbff5570a250feff (diff)
downloaddevtools-1736c182635da653babe2ec607a41294fdd5aacf.tar.xz
Merge commit 'b807c' into complete
Conflicts: makechrootpkg.in
-rw-r--r--makechrootpkg.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index a48f658..b8de509 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -115,14 +115,14 @@ umask 0022
# Lock the chroot we want to use. We'll keep this lock until we exit.
# Note this is the same FD number as in mkarchroot
-lock_open_write 9 "$copydir.lock" "Locking chroot copy '$copy'"
+lock_open_write 9 "$copydir.lock" "Locking chroot copy [$copy]"
if [[ ! -d $copydir ]] || $clean_first; then
# Get a read lock on the root chroot to make
# sure we don't clone a half-updated chroot
lock_open_read 8 "$chrootdir/root" "Locking clean chroot"
- stat_busy 'Creating clean working copy'
+ stat_busy "Creating clean working copy [$copy]"
use_rsync=false
if type -P btrfs >/dev/null; then
[[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null