Changeset 1515 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder
- Timestamp:
- May 10, 2012, 12:47:51 PM (12 years ago)
- Location:
- devel/pb-modules/lib/ProjectBuilder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb-modules/lib/ProjectBuilder/Base.pm
r1513 r1515 14 14 use strict; 15 15 use lib qw (lib); 16 use Carp 'cluck';16 use Carp qw/confess cluck/; 17 17 use Cwd; 18 18 use File::Path; … … 109 109 sub pb_mkdir_p { 110 110 my @dir = @_; 111 my $ret = mkpath(@dir, 0, 0755); 111 my $ret = eval { mkpath(@dir, 0, 0755) }; 112 confess "pb_mkdir_p @dir failed in ".getcwd().": $@" if ($@); 112 113 return($ret); 113 114 } -
devel/pb-modules/lib/ProjectBuilder/Distribution.pm
r1514 r1515 10 10 use strict; 11 11 use Data::Dumper; 12 use Carp 'confess'; 12 13 use ProjectBuilder::Version; 13 14 use ProjectBuilder::Base; … … 303 304 my $deps = shift || undef; 304 305 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 305 313 # Protection 306 314 return if (not defined $pbos->{'install'}); … … 313 321 # This may not be // proof. We should test for availability of repo and sleep if not 314 322 my $cmd = "$pbos->{'install'} $deps"; 315 pb_system($cmd,"Installing dependencies ($cmd)"); 323 my $ret = pb_system($cmd, "Installing dependencies ($cmd)", undef, 1); 324 # Try to accomodate deficient proxies 325 if ($ret != 0) { 326 pb_system($cmd, "Re-trying installing dependencies ($cmd)"); 327 } 316 328 } 317 329
Note:
See TracChangeset
for help on using the changeset viewer.