diff mbox

[pacman-dev] makepkg: avoid false "Signing package(s)" msg when signing is disabled

Message ID 20171112174341.31411-1-eschwartz@archlinux.org
State Accepted, archived
Headers show

Commit Message

Eli Schwartz Nov. 12, 2017, 5:43 p.m. UTC 
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>
---
 scripts/libmakepkg/integrity/generate_signature.sh.in | 6 +++---
 scripts/makepkg.sh.in                                 | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in
index 6d65d82d..8bb69984 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 cdcda4e8..9a434e27 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1589,8 +1589,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))"
 	exit 0