Changeset 2005 in ProjectBuilder

Timestamp:

Sep 30, 2015, 5:48:27 PM (10 years ago)

Author:

Bruno Cornec

Message:

Solve issue for signing packages when infra unavailable

With the new RPM::SIgn module of Mageia 5 when the infra to sign is not
there (such as keys unavailable) the call to the rpmsign command was
blocking. We now test whether new returns a keyid attribute defined and
if not skip the call to rpmsign.

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -4817 +4817 @@
         pb_log(1,"WARNING: Install RPM4::Sign to benefit from automatic package signing.\n");
     } else {
-        return if ((not defined $ENV{'PBPASSPHRASE'}) and (not defined $ENV{'PBPASSFILE'}));
+        return if (((not defined $ENV{'PBPASSPHRASE'}) and (not defined $ENV{'PBPASSFILE'})) || (not defined $ENV{'PBPACKAGER'}) || (not defined $ENV{'PBPASSPATH'}));
         my $sign = RPM4::Sign->new(
             passphrase => $ENV{'PBPASSPHRASE'},
@@ -4824 +4824 @@
             password_file => $ENV{'PBPASSFILE'}, 
         );
+        return if (not defined $sign);
+        return if (not defined $sign->{name});
+        return if (not defined $sign->{path});
+        return if ((not defined $sign->{passphrase}) && (not defined $sign->{password_file}));
+        return if (not defined $sign->{keyid});
 
         pb_log(0,"Signing RPM packages...\n");