Changeset 1253 in ProjectBuilder for devel/rpmbootstrap/bin/rpmbootstrap

Timestamp:

Mar 11, 2011, 8:58:41 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Try to be more error proof when issues with repository download

File:

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -279 +279 @@
     while ($found == 0) {
         $response1 = $ua->get("$repo/repodata");
+        pb_log(2,"REPO analyzed: $repo\n");
         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 =~ /^[\/]+$/);
+            die "Unable to find the repodata structure of the mirror $mirror\nPlease check the URL or warn the dev team.\n" if (($path =~ /^[\/]+$/) || ($path =~ /^$/));
         
             # / not reached, so looping
@@ -292 +292 @@
             # repodata found $repo is correct
             $found = 1;
+            pb_log(2,"REPO found: $repo\n");
             last;
         }