bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: avoid false "Signing package(s)" msg when signing is disabled

Browse source 
Followup on c6b04c0465 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>
This commit is contained in:
Eli Schwartz 2017-11-12 12:26:56 -05:00 • committed by Allan McRae
parent d8717a6a96
commit c54621d819
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/libmakepkg/integrity/generate_signature.sh.in
View file

@ -26,9 +26,6 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'}
source "$LIBRARY/util/message.sh" source "$LIBRARY/util/message.sh"
create_signature() { create_signature() {
if [[ $SIGNPKG != 'y' ]]; then
return 0
fi
local ret=0 local ret=0
local filename="$1" local filename="$1"
@ -50,6 +47,9 @@ create_signature() {
} }
create_package_signatures() { create_package_signatures() {
if [[ $SIGNPKG != 'y' ]]; then
return 0
fi
local pkgarch pkg_file local pkgarch pkg_file
local pkgname_backup=("${pkgname[@]}") local pkgname_backup=("${pkgname[@]}")
local fullver=$(get_full_version) local fullver=$(get_full_version)

2
scripts/makepkg.sh.in
View file

@ -1587,8 +1587,10 @@ if (( SOURCEONLY )); then
enter_fakeroot enter_fakeroot
if [[ $SIGNPKG = 'y' ]]; then
msg "$(gettext "Signing package...")" msg "$(gettext "Signing package...")"
create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}" create_signature "$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}"
fi
msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))" msg "$(gettext "Source package created: %s")" "$pkgbase ($(date +%c))"
exit $E_OK exit $E_OK