summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-11-24 16:14:24 +0000
committerOlivier Blin <oblin@mandriva.com>2009-11-24 16:14:24 +0000
commit5d3bb5e547281c3ca79da5fb49e8a23234c4702b (patch)
tree627cd8058d231d53941f3d73fc8d8bd4639b4ef9 /perl-install
parent73f8e6f9bcf7c1607f31aeb5de610ca7c6d15206 (diff)
downloaddrakx-5d3bb5e547281c3ca79da5fb49e8a23234c4702b.tar
drakx-5d3bb5e547281c3ca79da5fb49e8a23234c4702b.tar.gz
drakx-5d3bb5e547281c3ca79da5fb49e8a23234c4702b.tar.bz2
drakx-5d3bb5e547281c3ca79da5fb49e8a23234c4702b.tar.xz
drakx-5d3bb5e547281c3ca79da5fb49e8a23234c4702b.zip
do not stay chdired in /mnt/var/cache/urpmi when download fails (workaround urpmi bug)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/http.pm6
2 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index dcb41c48c..df4dcce44 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -9,6 +9,8 @@
o unmount swap too when unmounting all partitions
o do not suggest Windows mountpoint for mounted partitions
(breaks install if the Win partition is the installer media)
+- do not stay chdired in /mnt/var/cache/urpmi when download fails
+ (workaround urpmi bug)
Version 12.77 - 30 October 2009
diff --git a/perl-install/install/http.pm b/perl-install/install/http.pm
index 3e879a874..c98a4184d 100644
--- a/perl-install/install/http.pm
+++ b/perl-install/install/http.pm
@@ -54,7 +54,13 @@ sub get_file_and_size {
urpm::download::set_cmdline_proxy(http_proxy => "http://$proxy/");
}
+ (my $cwd) = getcwd() =~ /(.*)/;
my $res = eval { urpm::download::sync_url($urpm, $url, %o_options, dir => $cachedir) };
+ #- urpmi does not always reset cwd when dying or failing!
+ #- do not stay in /mnt/var/cache/urpmi, it's evil to be in /mnt
+ #- FIXME: fix urpmi
+ chdir $cwd;
+
if ($res) {
open(my $f, $file);
(-s $file, $f);