diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2017-04-02 04:09:55 -0400 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-04-05 22:11:16 +0200 |
| commit | cb35d74f8ce0e1ad489c59d608877e4d6b34ca85 (patch) | |
| tree | 1e03536795be58879ae0af8964b55545c51b184b /makechrootpkg.in | |
| parent | 14d5e1c21b69975a8d30aba059e1012595d48bba (diff) | |
| download | devtools32-cb35d74f8ce0e1ad489c59d608877e4d6b34ca85.tar.xz | |
Avoid using string interpolation; use printf format strings instead.
This involves extending the signature of lib/common.sh's `stat_busy()`,
`lock()`, and `slock()`. The `mesg=$1; shift` in stat_busy even suggests
that this is what was originally intended from it.
Diffstat (limited to 'makechrootpkg.in')
| -rw-r--r-- | makechrootpkg.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 890a359..5329f76 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -90,14 +90,14 @@ load_vars() { create_chroot() { # Lock the chroot we want to use. We'll keep this lock until we exit. - lock 9 "$copydir.lock" "Locking chroot copy [$copy]" + lock 9 "$copydir.lock" "Locking chroot copy [%s]" "$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 slock 8 "$chrootdir/root.lock" "Locking clean chroot" - stat_busy "Creating clean working copy [$copy]" + stat_busy "Creating clean working copy [%s]" "$copy" if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then subvolume_delete_recursive "$copydir" || die "Unable to delete subvolume %s" "$copydir" @@ -118,7 +118,7 @@ create_chroot() { } clean_temporary() { - stat_busy "Removing temporary copy [$copy]" + stat_busy "Removing temporary copy [%s]" "$copy" if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then btrfs subvolume delete "$copydir" >/dev/null || die "Unable to delete subvolume %s" "$copydir" |