From cc3d6cf08b0d39b2a1aa888d5d7119699aca9f61 Mon Sep 17 00:00:00 2001
From: Arnaud Patard <rtp@mageia.org>
Date: Tue, 15 May 2012 15:21:44 +0000
Subject: - 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

---
 perl-install/Makefile.config | 2 +-
 perl-install/NEWS            | 3 +++
 perl-install/any.pm          | 2 +-
 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 {
-- 
cgit v1.2.1