From d976891fe38a82a8aa6e0fb6a5c5bb40bab1a18e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 8 Jun 2012 18:52:17 +0000
Subject: drop /usr/X11R6/bin from $PATH

---
 urpm/download.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'urpm')

diff --git a/urpm/download.pm b/urpm/download.pm
index 18c63f42..97187270 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -886,7 +886,11 @@ sub sync_rel {
     my @result_files = map { $all_options->{dir} . '/' . basename($_) } @$rel_files;
     unlink @result_files if $all_options->{preclean};
 
-    if (eval { _sync_webfetch_raw($urpm, $medium, $rel_files, \@files, $all_options); 1 }) {
+    (my $cwd) = getcwd() =~ /(.*)/;
+    eval { _sync_webfetch_raw($urpm, $medium, $rel_files, \@files, $all_options) };
+    my $err = $@;
+    chdir $cwd;
+    if (!$err) {
 	$urpm->{log}(N("retrieved %s", $files_text));
 	\@result_files;
     } else {
-- 
cgit v1.2.1