Changeset 2122 in ProjectBuilder for devel/pb

Timestamp:

Jul 23, 2016, 8:58:18 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix issue with rpmsign aborting the build script when incorrect
• Fix fedora perl deps by using perl-core (exists since f10 !!). This should solve the perl headackes on Fedora

File:

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

devel/pb/bin/pb

@@ -2392 +2392 @@
 echo "Architecture: Source" >> dists/$pbos->{'version'}/$projcomponent/source/Release
 echo "Creating Release metadata"
-# Signing that file would be useful but uneasy as gpg keys are not there
-# Cf: http://wiki.debian.org/SecureApt
-# Same as for repomd
 apt-ftparchive -o APT::FTPArchive::Release::Suite=$pbos->{version} release dists/$pbos->{'version'} > dists/$pbos->{'version'}/Release
 rm -rf \$TMPD
@@ -2682 +2679 @@
         $cmdverb = "verbose_\[$v\] ";
     }
-    # this is where we lanch the execution
+    # this is where we launch the execution
     if (($cmt =~ /^VE/) && ($vetype eq "docker") && ($pbstep >= 3)) {
         pb_mkdir_p("$ENV{'PBTMP'}/vebuild");
@@ -2716 +2713 @@
         print DOCKER "find \$TDIR -type f -print0 | xargs -0 chmod 644\n";
         print DOCKER "find \$TDIR -type d -print0 | xargs -0 chmod 777 2> /dev/null\n";
+        #print DOCKER "ls -al \$TDIR\n";
         print DOCKER "exit 0\n";
-        #print DOCKER "ls -al \$TDIR\n";
         close(DOCKER);
         $shcmd .= " -v $ENV{'PBBUILDDIR'}:$homedir/$bdir-2 -v $ENV{'PBTMP'}/vebuild:$homedir/$tdir-2 -w $homedir/$tdir-2 $tag{$pbstep} $dkcmd";
@@ -4860 +4857 @@
     # RPM4::Sign not found
     pb_log(1,"WARNING: Install RPM4::Sign to benefit from automatic package signing.\n");
+    return(undef);
 } else {
     return(undef) if (((not defined $ENV{'PBPASSPHRASE'}) and (not defined $ENV{'PBPASSFILE'})) || (not defined $ENV{'PBPACKAGER'}) || (not defined $ENV{'PBPASSPATH'}));
@@ -4877 +4875 @@
 }
 }
+
+# Cf: http://wiki.debian.org/SecureApt
 
 sub pb_sign_file {
@@ -4912 +4912 @@
 
 pb_log(2,"entering pb_sign_pkg: $made ".Dumper($pbos)."\n");
-pb_sign_setenv();
 # Remove extra spaces
 $made =~ s/\s+/ /g;
@@ -4920 +4919 @@
 if ($pbos->{'type'} eq "rpm") {
     my $sign = pb_sign_setenv();
-    pb_log(0,"Signing RPM packages...\n");
-    pb_log(2,"pb_sign_pkg: pkgs:".Dumper(split(/ /,$made))."\n");
-    $sign->rpmssign(split(/ /,$made));
+    if (defined $sign) {
+        pb_log(0,"Signing RPM packages...\n");
+        pb_log(2,"pb_sign_pkg: pkgs:".Dumper(split(/ /,$made))."\n");
+        $sign->rpmssign(split(/ /,$made));
+    }
 } elsif ($pbos->{'type'} eq "deb") {
     my $changes = "";