summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-05-29 22:26:19 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-05-30 14:11:18 -0400
commit4c5679b931393b488a76c8248f1dd8e2621ca25e (patch)
tree9802f9cc656af26fb5c122259459b270b7fbedfb
parentd28376fb2af27cb65fd8c4253079ec65d646275a (diff)
libremakepkg: Fix it_succeeds_with_good_signatures
Do this by syncing makepkg_args with makechrootpkg's default_makepkg_args; recent devtools have makechrootpkg not copy the keyring in to the chroot. This incorporates 3 commits from Arch devtools: 7ca4eb82d (2017-05-02): add --holdver 0cbc179d2 (2017-07-13): use long options; `-s`→`--syncdeps`, `-L`→`--log` 75fdff181 (2017-07-13): add --skipinteg
-rwxr-xr-xsrc/chroot-tools/libremakepkg2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index d8d935c..46c289c 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -184,7 +184,7 @@ err_chflag() {
main() {
# Initial variable values ##############################################
local copy=$([[ $LIBREUSER == root ]] && echo copy || echo "$LIBREUSER")
- local makepkg_args=(-s --noconfirm -L)
+ local makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
local repack=false
local chroot=''