Changeset 1031 in ProjectBuilder for devel/rpmbootstrap

Timestamp:

May 22, 2010, 8:40:29 PM (14 years ago)

Author:

Bruno Cornec

Message:

• the repodata dir is now search in the parents dir of the mirror given as it depends on yum version. CentOS 4 & 5, Fedora 12 OK.
• Update perl modules versions (Date-Manip is now in 6.x, still using 5.x at the moment)

File:

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -261 +261 @@
 }
 pb_log(3,"Mirror $mirror gave answer: ".Dumper($response->dump(maxlength => 0))."\n");
+
+# Try to find where the repodata structure is for later usage
+my $repo = $mirror;
+my $found = 0;
+if ($pbupd =~ /yum/) {
+    my $response1;
+    while ($found == 0) {
+        $response1 = $ua->get("$repo/repodata");
+        if (! $response1->is_success) {
+            $repo = dirname($repo);
+
+            pb_log(2,"REPO analyzed: $repo\n");
+            # There is a limit to the loop, when / is reached and nothing found
+            my ($scheme, $account, $host, $port, $path) = pb_get_uri($repo);
+            die "Unable to find the repodata structure of the mirror $mirror\nPlease check the URL or warn the dev team.\n" if ($path =~ /^[\/]+$/);
+            
+            # / not reached, so looping
+            next;
+        } else {
+            # repodata found $repo is correct
+            $found = 1;
+            last;
+        }
+    }
+}
 
 # Manages architectures specificities
@@ -433 +458 @@
         pb_system("sed -i -e 's/^mirrorlist/#mirrorlist/' $i","","quiet");
         # rather use neutral separators here
-        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$mirror|' $i","","quiet");
+        pb_system("sed -i -e 's|^#baseurl.*\$|baseurl=$repo|' $i","","quiet");
     }
     $minipkglist = "ldconfig yum passwd vim-minimal dhclient authconfig";