Changeset 1892 in ProjectBuilder for devel/rpmbootstrap
- Timestamp:
- Jul 13, 2014, 3:26:33 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/rpmbootstrap/bin/rpmbootstrap
r1817 r1892 290 290 my $resp; 291 291 my $repo; 292 my @list_pkg;292 my %list_pkg; 293 293 294 294 ($repo,$resp) = rbs_mirror_response($mirror); 295 @list_pkg = split(/\n/,$resp->as_string()); 295 foreach my $r (split(/\n/,$resp->as_string())) { 296 $list_pkg{$r} = $mirror; 297 } 296 298 297 299 # If an update source is availble add it after so that these pkgs update the main ones … … 299 301 my $void; 300 302 ($void,$resp) = rbs_mirror_response($mirror.$updater); 301 push(@list_pkg,split(/\n/,$resp->as_string())); 303 foreach my $r (split(/\n/,$resp->as_string())) { 304 $list_pkg{$r} = $mirror.$updater; 305 } 302 306 } 303 307 … … 309 313 my %url; 310 314 my %done; 311 foreach my $l ( @list_pkg) {315 foreach my $l (keys %list_pkg) { 312 316 my ($url,$desc) = rbs_find_pkg($l,$parch,"pkg"); 313 317 if (defined $url) { 314 $url{$url} = "$ mirror/$desc";318 $url{$url} = "$list_pkg{$l}/$desc"; 315 319 } else { 316 320 pb_log(3,"not a package, maybe a dir containing packages\n"); … … 391 395 my $p1 = basename($url{$p}); 392 396 if (! -f "$cachedir/$p1") { 393 pb_system("wget -- quiet -O $cachedir/$p1-new $url{$p}","Downloading package $p1 ...");397 pb_system("wget --tries=5 --quiet -O $cachedir/$p1-new $url{$p}","Downloading package $p1 ..."); 394 398 rename("$cachedir/$p1-new", "$cachedir/$p1") || die "mv $cachedir/$p1-new $cachedir/$p1 failed: $!"; 395 399 } else {
Note:
See TracChangeset
for help on using the changeset viewer.