summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard <rtp@mageia.org>2012-05-15 15:21:44 +0000
committerArnaud Patard <rtp@mageia.org>2012-05-15 15:21:44 +0000
commit28631c4de5dc7b84bdd024a271c7a8cb76783ea5 (patch)
tree8eb700b2f422a9fcaab7af4b0464e560603db24a
parent74c6ae1a92ce78071688973922a7e3ab708b6d03 (diff)
downloaddrakx-28631c4de5dc7b84bdd024a271c7a8cb76783ea5.tar
drakx-28631c4de5dc7b84bdd024a271c7a8cb76783ea5.tar.gz
drakx-28631c4de5dc7b84bdd024a271c7a8cb76783ea5.tar.bz2
drakx-28631c4de5dc7b84bdd024a271c7a8cb76783ea5.tar.xz
drakx-28631c4de5dc7b84bdd024a271c7a8cb76783ea5.zip
- fix updates installation. installUpdates was relying on urpmi_add_all_media
return value different than 0, which was always 0 due to the 'undef $wait' line
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm2
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 378724a03..d542e8e2b 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=14.21
+VERSION:=14.22
SUDO = sudo
TMPDIR = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 282930e63..6cbee8f43 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+Version 14.22 - 15 May 2012
+- fix urpmi_add_all_media
+
Version 14.21 - 11 May 2012
- harddrake2: allow writing 0 as module option, and forbid options
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 021a4b004..3e774e738 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -976,8 +976,8 @@ sub urpmi_add_all_media {
local $ENV{URPMI_ADDMEDIA_REASON} = $reason;
my $log_file = '/root/drakx/updates.log';
- run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, @options);
undef $wait;
+ run_program::rooted($::prefix, $binary, '>>', $log_file, '2>>', $log_file, @options);
}
sub autologin {