Changeset 1532 in ProjectBuilder

Timestamp:

May 13, 2012, 4:30:35 AM (12 years ago)

Author:

Bruno Cornec

Message:

• rpmbootstrap: Improve error message, include why the download failed (turned out web server was being slow). Strip off spaces in package names appearing because of multi-line conf file support. Download files to a temporary name so that ctrl-c won't leave around bad .rpm files. (Eric Anderson)

File:

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

devel/rpmbootstrap/bin/rpmbootstrap

@@ -287 +287 @@
     if ($mirror =~ /i386/) {
         # Some distro have an i586 or i686 mirror dir instead for i386
-        warn "Unable to download packages from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.";
+        warn "Unable to download package from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.".$response->status_line;
         $mirror =~ s|/i386/|/i586/|;
         $response = $ua->get($mirror);
         if (! $response->is_success) {
-            die "Unable to download packages from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}";
+            die "Unable to download package from $mirror for $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}".$response->status_line;
         }
     }
@@ -383 +383 @@
 
 foreach my $p (split(/,/,$pkgs)) {
+    $p =~ s/\s+//go;
     pb_log(1,"Processing package $p ...\n");
     # Just print packages names if asked so. 
@@ -393 +394 @@
             my $p1 = basename($url{$p});
             if (! -f "$cachedir/$p1") {
-                pb_system("wget --quiet -O $cachedir/$p1 $url{$p}","Downloading package $p1 ...");
+                pb_system("wget --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 {
                 pb_log(1,"Package $p1 already in cache\n");