diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-16 01:57:39 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-08-16 01:57:39 -0400 |
| commit | fabc14e262414debb6bbd562e6a6a37afa2cce79 (patch) | |
| tree | c569d6edad57db9692fec72383ccbb5687b1d76d /makechrootpkg.in | |
| parent | 06e3de14a9d82b456176c1966919e0bbd457da69 (diff) | |
| parent | 8dbb02de4f50aeb05c5df2ef8d9c8cf394b4f9ac (diff) | |
Merge remote-tracking branch 'remotes/devtools/master'
Diffstat (limited to 'makechrootpkg.in')
| -rw-r--r-- | makechrootpkg.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 3f73f1e..ce003c8 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -83,8 +83,8 @@ shift $(($OPTIND - 1)) # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") -[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '$passeddir'" -[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot $chrootdir/root base-devel" +[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" +[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" # Detect chrootdir filesystem type chroottype=$(stat -f -c %T "$chrootdir") @@ -135,10 +135,10 @@ create_chroot() { if [[ "$chroottype" == btrfs ]]; then if [[ -d $copydir ]]; then btrfs subvolume delete "$copydir" >/dev/null || - die "Unable to delete subvolume $copydir" + die "Unable to delete subvolume %s" "$copydir" fi btrfs subvolume snapshot "$chrootdir/root" "$copydir" >/dev/null || - die "Unable to create subvolume $copydir" + die "Unable to create subvolume %s" "$copydir" else mkdir -p "$copydir" rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir" @@ -154,11 +154,11 @@ clean_temporary() { stat_busy "Removing temporary copy [$copy]" if [[ "$chroottype" == btrfs ]]; then btrfs subvolume delete "$copydir" >/dev/null || - die "Unable to delete subvolume $copydir" + die "Unable to delete subvolume %s" "$copydir" else # avoid change of filesystem in case of an umount failure rm --recursive --force --one-file-system "$copydir" || - die "Unable to delete $copydir" + die "Unable to delete %s" "$copydir" fi # remove lock file @@ -361,7 +361,7 @@ if (( ret != 0 )); then if $temp_chroot; then die "Build failed" else - die "Build failed, check $copydir/build" + die "Build failed, check %s/build" "$copydir" fi else true |