diff mbox

[pacman-dev] Fix signing of debug packages

Message ID 20180618065251.18846-1-allan@archlinux.org
State Accepted, archived
Headers show

Commit Message

Allan McRae June 18, 2018, 6:52 a.m. UTC
Commit 9c8d7a80 broke the signing of debug packages by merging code up but
not changing the test condition.

Signed-off-by: Allan McRae <allan@archlinux.org>
---

Using this minimal fix for 5.1.1.   Eli's patch refacotring this will
be considered later.

 scripts/libmakepkg/integrity/generate_signature.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eli Schwartz June 18, 2018, 6:53 a.m. UTC | #1
On 06/18/2018 02:52 AM, Allan McRae wrote:
> Commit 9c8d7a80 broke the signing of debug packages by merging code up but
> not changing the test condition.
> 
> Signed-off-by: Allan McRae <allan@archlinux.org>
> ---
> 
> Using this minimal fix for 5.1.1.   Eli's patch refacotring this will
> be considered later.
Sounds okay to me.
diff mbox

Patch

diff --git a/scripts/libmakepkg/integrity/generate_signature.sh.in b/scripts/libmakepkg/integrity/generate_signature.sh.in
index 442fe031..b53a90d0 100644
--- a/scripts/libmakepkg/integrity/generate_signature.sh.in
+++ b/scripts/libmakepkg/integrity/generate_signature.sh.in
@@ -63,7 +63,7 @@  create_package_signatures() {
 	done
 
 	# check if debug package needs a signature
-	if ! check_option "debug" "y" || ! check_option "strip" "y"; then
+	if check_option "debug" "y" && check_option "strip" "y"; then
 		pkg=$pkgbase-@DEBUGSUFFIX@
 		pkgarch=$(get_pkg_arch)
 		pkg_file="$PKGDEST/${pkg}-${fullver}-${pkgarch}${PKGEXT}"