Changeset 1517 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm
- Timestamp:
- May 10, 2012, 6:07:28 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1516 r1517 290 290 } 291 291 292 # Internal function 293 294 sub pb_apply_conf_proxy ($) { 295 my ($pbos) = @_; 296 297 my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy")); 298 my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy")); 299 300 # We do not overwrite shell settings 301 $ENV{ftp_proxy} ||= $ftp_proxy; 302 $ENV{http_proxy} ||= $http_proxy; 303 } 304 292 305 =item B<pb_distro_installdeps> 293 306 … … 304 317 my $deps = shift || undef; 305 318 306 my $ftp_proxy = pb_distro_get_param($pbos,pb_conf_get_if("ftp_proxy")); 307 my $http_proxy = pb_distro_get_param($pbos,pb_conf_get_if("http_proxy")); 308 309 # We do not overwrite shell settings 310 $ENV{ftp_proxy} ||= $ftp_proxy; 311 $ENV{http_proxy} ||= $http_proxy; 312 319 pb_apply_conf_proxy($pbos); 313 320 # Protection 314 321 return if (not defined $pbos->{'install'}); … … 316 323 # Get dependencies in the build file if not forced 317 324 $deps = pb_distro_getdeps($f,$pbos) if (not defined $deps); 325 pb_log(1, "ftp_proxy=$ENV{ftp_proxy} http_proxy=$ENV{http_proxy}\n"); 318 326 pb_log(2,"deps: $deps\n"); 319 327 return if ((not defined $deps) || ($deps =~ /^\s*$/)); … … 326 334 pb_system($cmd, "Re-trying installing dependencies ($cmd)"); 327 335 } 336 # Check that all deps have been installed correctly 337 $deps = pb_distro_getdeps($f, $pbos); 338 die "Some dependencies did not install ($deps)" if ((defined $deps) && ($deps =~ /\S/)); 328 339 } 329 340 … … 520 531 return if ($param eq ""); 521 532 533 pb_apply_conf_proxy($pbos); 534 522 535 # Loop on the list of additional repo 523 536 foreach my $i (split(/,/,$param)) { … … 538 551 my $pn = $bn; 539 552 $pn =~ s/\.rpm//; 540 if (pb_system("rpm -q --quiet $pn","","quiet" ) != 0) {553 if (pb_system("rpm -q --quiet $pn","","quiet",1) != 0) { 541 554 pb_system("sudo rpm -Uvh $ENV{'PBTMP'}/$bn","Adding package to setup repository"); 542 555 }
Note:
See TracChangeset
for help on using the changeset viewer.