diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2017-11-12 18:26:56 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-03-15 02:16:00 +0100 |
| commit | c54621d81986e14c7d112350fdf288e74df7a8a8 (patch) | |
| tree | 62a30cc3f6535ce3506e485e476845a654acb8a1 | |
| parent | d8717a6a9666ec80c8645d190d6f9c7ab73084ac (diff) | |
| download | pacman-c54621d81986e14c7d112350fdf288e74df7a8a8.tar.gz pacman-c54621d81986e14c7d112350fdf288e74df7a8a8.tar.xz | |
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 <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/libmakepkg/integrity/generate_signature.sh.in | 6 | ||||
| -rw-r--r-- | 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 |