Changeset 623

Timestamp:

12/01/08 02:30:28 (4 years ago)

Author:

bruno

Message:

• Adds preliminary support for rpm signing
• Fix a bad bug in the call function of pb_distro_getdeps

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -357 +357 @@
 $deps = pb_distro_getdeps("$f", $dtype) if (not defined $deps);
 pb_log(2,"deps: $deps\n");
-return if (not defined $deps);
+return if ((not defined $deps) || ($deps =~ /^\s*$/));
 if ($deps !~ /^[    ]*$/) {
     pb_system("$dupd $deps","Installing dependencies ($deps)");
@@ -439 +439 @@
 sub pb_distro_only_deps_needed {
 
+my $dtype = shift || undef;
 my $deps = shift || undef;
-my $dtype = shift || undef;
-
+
+return("") if ((not defined $deps) || ($deps =~ /^\s*$/));
 my $deps2 = "";
 # Avoid to install what is already there

devel/pb/bin/pb

@@ -1290 +1290 @@
         pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
 
+        # Sign packages locally
+        if ($dtype eq "rpm") {
+            pb_system("rpm --addsign --define \'_signature gpg\' --define \'_gpg_name $ENV{'PBPACKAGER'}\' $made","Signing RPM packages packages");
+        } elsif ($dtype eq "deb") {
+            pb_system("debsign $made","Signing DEB packages");
+        } else {
+            pb_log(0,"I don't know yet how to sign packages for type $dtype. Please give feedback to dev team");
+        }
+
         # We want to send them to the ssh account so overwrite what has been done before
         undef $pbaccount;