diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2019-03-28 23:04:32 +0100 |
|---|---|---|
| committer | Levente Polyak <anthraxx@archlinux.org> | 2019-08-09 19:41:52 +0200 |
| commit | 5fcd90a212d332fa2900ba4b1a1c12e2ab55ea44 (patch) | |
| tree | 113994dff0616963f2cd1550de7e4e44e4aea318 | |
| parent | f6f4da26cbe57c1c64ca11ce960277942148135b (diff) | |
| download | devtools-5fcd90a212d332fa2900ba4b1a1c12e2ab55ea44.tar.gz devtools-5fcd90a212d332fa2900ba4b1a1c12e2ab55ea44.tar.xz | |
makechrootpkg: accept arguments useful to verifysource
And pass them on to download_sources outside the chroot.
Fixes FS#35652
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
| -rw-r--r-- | makechrootpkg.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index c33ff8a..4c301e6 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -17,6 +17,7 @@ shopt -s nullglob default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg) makepkg_args=("${default_makepkg_args[@]}") +verifysource_args=() chrootdir= passeddir= makepkg_user= @@ -253,7 +254,7 @@ download_sources() { # Ensure sources are downloaded sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \ env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \ - makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o || + makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" || die "Could not download sources." } @@ -327,9 +328,10 @@ makepkg_args+=("${@:$OPTIND}") # See if -R or -e was passed to makepkg for arg in "${@:$OPTIND}"; do case ${arg%%=*} in - --repackage|--noextract) keepbuilddir=1; break ;; + --skip*|--holdver) verifysource_args+=("$arg") ;; + --repackage|--noextract) keepbuilddir=1 ;; --*) ;; - -*R*|-*e*) keepbuilddir=1; break ;; + -*R*|-*e*) keepbuilddir=1 ;; esac done |