- Timestamp:
- May 9, 2012, 2:20:04 AM (13 years ago)
- Location:
- devel/pb-modules/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Base.pm
r1504 r1505 14 14 use strict; 15 15 use lib qw (lib); 16 use Carp 'cluck'; 17 use Cwd; 16 18 use File::Path; 17 19 use File::Temp qw(tempdir); … … 159 161 return($res) 160 162 } 161 if ($res == -1) { 162 pb_log(0,"failed to execute ($cmd): $!\n") if ((! defined $verbose) || ($verbose ne "quiet")); 163 pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet"))); 164 } elsif ($res & 127) { 165 pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n") if ((! defined $verbose) || ($verbose ne "quiet")); 166 pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet"))); 167 } elsif ($res == 0) { 163 164 my $cwd = getcwd; 165 my $error = undef; 166 $error = "failed to execute ($cmd) in $cwd: $!\n" if ($res == -1); 167 $error = "child ($cmd) died with signal ".($res & 127).", ".($res & 128) ? 'with' : 'without'." coredump\n" if ($res & 127); 168 $error = "child ($cmd) cwd=$cwd exited with value ".($res >> 8)."\n" if ($res != 0); 169 170 if (defined $error) { 171 pb_log(0, $error) if ((! defined $verbose) || ($verbose ne "quiet")) || $Global::pb_stop_on_error; 172 pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet") || $Global::pb_stop_on_error)); 173 if ($Global::pb_stop_on_error) { 174 cluck "error running command ($cmd) with cwd=$cwd"; 175 exit(1); 176 } 177 } else { 168 178 pb_log(0,"OK\n") if ((! defined $verbose) || ($verbose ne "quiet")); 169 pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((defined $verbose) and (-f "$ENV{'PBTMP'}/system.$$.log") and ($verbose ne "quiet")); 170 } else { 171 pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n") if ((! defined $verbose) || ($verbose ne "quiet")); 172 pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and ((! defined $verbose) || ($verbose ne "quiet"))); 173 } 179 pb_display_file("$ENV{'PBTMP'}/system.$$.log") if ((-f "$ENV{'PBTMP'}/system.$$.log") and (defined $verbose) and ($verbose ne "quiet")); 180 } 181 174 182 return($res); 175 183 } -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1402 r1505 305 305 306 306 # Get dependencies in the build file if not forced 307 $deps = pb_distro_getdeps($f, 307 $deps = pb_distro_getdeps($f,$pbos) if (not defined $deps); 308 308 pb_log(2,"deps: $deps\n"); 309 309 return if ((not defined $deps) || ($deps =~ /^\s*$/)); 310 if ($deps !~ /^[ ]*$/) { 311 312 pb_system("$pbos->{'install'} $deps","Installing dependencies ($deps)");313 } 310 311 # This may not be // proof. We should test for availability of repo and sleep if not 312 my $cmd = "$pbos->{'install'} $deps"; 313 pb_system($cmd,"Installing dependencies ($cmd)"); 314 314 } 315 315 … … 394 394 my $deps2 = ""; 395 395 # Avoid to install what is already there 396 foreach my $p (split(/ /,$deps)) { 396 foreach my $p (split(/\s+/,$deps)) { 397 next if $p =~ /^\s*$/o; 397 398 if ($pbos->{'type'} eq "rpm") { 398 399 my $res = pb_system("rpm -q --whatprovides --quiet $p","","quiet");
Note:
See TracChangeset
for help on using the changeset viewer.