Changeset 1558 in ProjectBuilder

Timestamp:

May 21, 2012, 3:56:09 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb: [BUGFIX] added code assumed it had Parallel::ForkManager package. (Eric Anderson)
• Fix more typos on comma (Bruno Cornec)

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• pb/bin/pb (modified) (3 diffs)

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

@@ -435 +435 @@
 
 This function checks that the commands needed for the subsystem are indeed present. 
-The required commands are passed as a coma separated string as first parameter.
-The optional commands are passed as a coma separated string as second parameter.
+The required commands are passed as a comma separated string as first parameter.
+The optional commands are passed as a comma separated string as second parameter.
 
 =cut
@@ -450 +450 @@
 $opt2 = $opt->{$appname} if (defined $opt and defined $appname);
 
-# cmds is a string of coma separated commands
+# cmds is a string of comma separated commands
 if (defined $req2) {
     foreach my $file (split(/,/,$req2)) {
@@ -457 +457 @@
 }
 
-# opts is a string of coma separated commands
+# opts is a string of comma separated commands
 if (defined $opt2) {
     foreach my $file (split(/,/,$opt2)) {

devel/pb/bin/pb

@@ -17 +17 @@
 # in their respective section
 use Getopt::Long qw(:config auto_abbrev no_ignore_case);
-use Carp 'cluck';
+use Carp qw/confess cluck/;
 use Data::Dumper;
 use English;
@@ -1090 +1090 @@
             my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
             $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
-                                    $all_ok = 0 unless (($code == 0) && ($signal == 0) && ($dump == 0)); });
+                                    $all_ok = 0 unless (($code == 0) && ($signal == 0) && ($dump == 0)); }) if (defined $pbparallel);
 
             pb_log(0,"Preparing delivery ...\n");
@@ -4317 +4317 @@
     }
     my $debsigncmd = pb_check_req("debsign",1);
-    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages",undef,1) if ($changes ne "");
+    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages",undef,1) if (($changes ne "") && (defined $debsigncmd));
 } else {
     pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");