From c54621d81986e14c7d112350fdf288e74df7a8a8 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 12 Nov 2017 12:26:56 -0500 Subject: makepkg: avoid false "Signing package(s)" msg when signing is disabled Followup on c6b04c04653ba9933fe978829148312e412a9ea7 which refactored the signing function to run outside of fakeroot, and in the process moved the status message to outside the $SIGNPKG check. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/libmakepkg/integrity/generate_signature.sh.in | 6 +++--- scripts/makepkg.sh.in | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in index be956797..df76fbbd 100644 --- a/scripts/libmakepkg/integrity/generate_signature.sh.in +++ b/scripts/libmakepkg/integrity/generate_signature.sh.in @@ -26,9 +26,6 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} source "$LIBRARY/util/message.sh" create_signature() { - if [[ $SIGNPKG != 'y' ]]; then - return 0 - fi local ret=0 local filename="$1" @@ -50,6 +47,9 @@ create_signature() { } create_package_signatures() { + if [[ $SIGNPKG != 'y' ]]; then + return 0 + fi local pkgarch pkg_file local pkgname_backup=("${pkgname[@]}") local fullver=$(get_full_version) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4f803bc2..0eed620c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1587,8 +1587,10 @@ if (( SOURCEONLY )); then enter_fakeroot - msg "$(gettext "Signing package...")" - create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" + if [[ $SIGNPKG = 'y' ]]; then + msg "$(gettext "Signing package...")" + create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" + fi msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))" exit $E_OK -- cgit v1.2.3-24-g4f1b