Changeset 1892 in ProjectBuilder

Timestamp:

Jul 13, 2014, 3:26:33 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix rpmbootstrap to support correctly mageia updates

File:

• devel/rpmbootstrap/bin/rpmbootstrap (modified) (4 diffs)

devel/rpmbootstrap/bin/rpmbootstrap

@@ -290 +290 @@
 my $resp;
 my $repo;
-my @list_pkg;
+my %list_pkg;
 
 ($repo,$resp) = rbs_mirror_response($mirror);
-@list_pkg = split(/\n/,$resp->as_string());
+foreach my $r (split(/\n/,$resp->as_string())) {
+    $list_pkg{$r} = $mirror;
+}
 
 # If an update source is availble add it after so that these pkgs update the main ones
@@ -299 +301 @@
     my $void;
     ($void,$resp) = rbs_mirror_response($mirror.$updater);
-    push(@list_pkg,split(/\n/,$resp->as_string()));
+    foreach my $r (split(/\n/,$resp->as_string())) {
+        $list_pkg{$r} = $mirror.$updater;
+    }
 }
 
@@ -309 +313 @@
 my %url;
 my %done;
-foreach my $l (@list_pkg) {
+foreach my $l (keys %list_pkg) {
     my ($url,$desc) = rbs_find_pkg($l,$parch,"pkg");
     if (defined $url) {
-        $url{$url} = "$mirror/$desc";
+        $url{$url} = "$list_pkg{$l}/$desc";
     } else {
         pb_log(3,"not a package, maybe a dir containing packages\n");
@@ -391 +395 @@
             my $p1 = basename($url{$p});
             if (! -f "$cachedir/$p1") {
-                pb_system("wget --quiet -O $cachedir/$p1-new $url{$p}","Downloading package $p1 ...");
+                pb_system("wget --tries=5 --quiet -O $cachedir/$p1-new $url{$p}","Downloading package $p1 ...");
                 rename("$cachedir/$p1-new", "$cachedir/$p1") || die "mv $cachedir/$p1-new $cachedir/$p1 failed: $!";
             } else {