summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-30 21:48:54 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-30 21:48:54 -0400
commit705f41e25cdf89bccef22a76a163f2ea52603979 (patch)
tree1c09e668c22a1855e2d30b80f2785e9c2c00d656
parent474fabf287cca3c65175bf05a75ae850326d9c36 (diff)
makechrootpkg.in: adjust mkarchroot usage to our version
-rw-r--r--makechrootpkg.in12
1 files changed, 9 insertions, 3 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 10956c9..b98951f 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -12,6 +12,12 @@ m4_include(lib/common.sh)
shopt -s nullglob
+# So that usage conflicts between upstream and -par mkarchroot don't get hidden
+# silently in a merge.
+archroot() {
+ mkarchroot "$@"
+}
+
makepkg_args='-s --noconfirm -L'
repack=false
update_first=false
@@ -151,7 +157,7 @@ if [[ -n "${install_pkgs[*]}" ]]; then
pkgname="${install_pkg##*/}"
cp "$install_pkg" "$copydir/$pkgname"
- mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
+ archroot -r "$copydir" pacman -U "/$pkgname" --noconfirm
(( ret += !! $? ))
rm "$copydir/$pkgname"
@@ -161,7 +167,7 @@ if [[ -n "${install_pkgs[*]}" ]]; then
[[ -f PKGBUILD ]] || exit $ret
fi
-$update_first && mkarchroot -u "$copydir"
+$update_first && archroot -u "$copydir"
mkdir -p "$copydir/build"
@@ -277,7 +283,7 @@ exit 0
EOF
chmod +x "$copydir/chrootbuild"
-if mkarchroot -r "/chrootbuild" "$copydir"; then
+if archroot -r "$copydir" "/chrootbuild"; then
for pkgfile in "$copydir"/pkgdest/*.pkg.tar.?z; do
if $add_to_db; then
mkdir -p "$copydir/repo"