Changeset 623


Ignore:
Timestamp:
Dec 1, 2008, 2:30:28 AM (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r622 r623  
    357357$deps = pb_distro_getdeps("$f", $dtype) if (not defined $deps);
    358358pb_log(2,"deps: $deps\n");
    359 return if (not defined $deps);
     359return if ((not defined $deps) || ($deps =~ /^\s*$/));
    360360if ($deps !~ /^[    ]*$/) {
    361361    pb_system("$dupd $deps","Installing dependencies ($deps)");
     
    439439sub pb_distro_only_deps_needed {
    440440
     441my $dtype = shift || undef;
    441442my $deps = shift || undef;
    442 my $dtype = shift || undef;
    443 
     443
     444return("") if ((not defined $deps) || ($deps =~ /^\s*$/));
    444445my $deps2 = "";
    445446# Avoid to install what is already there
  • devel/pb/bin/pb

    r622 r623  
    12901290        pb_system("$shcmd \"rm -rf $tdir $bdir\"","$cmt cleanup");
    12911291
     1292        # Sign packages locally
     1293        if ($dtype eq "rpm") {
     1294            pb_system("rpm --addsign --define \'_signature gpg\' --define \'_gpg_name $ENV{'PBPACKAGER'}\' $made","Signing RPM packages packages");
     1295        } elsif ($dtype eq "deb") {
     1296            pb_system("debsign $made","Signing DEB packages");
     1297        } else {
     1298            pb_log(0,"I don't know yet how to sign packages for type $dtype. Please give feedback to dev team");
     1299        }
     1300
    12921301        # We want to send them to the ssh account so overwrite what has been done before
    12931302        undef $pbaccount;
Note: See TracChangeset for help on using the changeset viewer.