From df28b302207b4b425760e4cc6e47e8fad0fee8d4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Sat, 25 Aug 2007 06:47:53 +0000
Subject: (update_sources_noninteractive) split it out of
 update_sources_interactive()

---
 rpmdrake.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'rpmdrake.pm')

diff --git a/rpmdrake.pm b/rpmdrake.pm
index 338b11fd..a355d6bf 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -81,6 +81,7 @@ our @EXPORT = qw(
     update_sources
     update_sources_check
     update_sources_interactive
+    update_sources_noninteractive
     add_medium_and_check
     check_update_media_version
     strip_first_underscore
@@ -791,20 +792,26 @@ sub update_sources_interactive {
 	)
     );
     if ($w->main) {
+        update_sources_noninteractive($urpm, \@media, %options);
+    }
+    return 0;
+}
+
+sub update_sources_noninteractive {
+    my ($urpm, $media, %options) = @_;
+
 	#- force ignored media to be returned alive (forked from urpmi.update...)
 	foreach (@{$urpm->{media}}) {
 	    $_->{modified} and delete $_->{ignore};
 	}
-        urpm::media::select_media($urpm, @media);
+        urpm::media::select_media($urpm, @$media);
         update_sources_check(
 	    $urpm,
 	    {},
 	    N_("Unable to update medium; it will be automatically disabled.\n\nErrors:\n%s"),
-	    @media,
+	    @$media,
 	);
 	return 1;
-    }
-    return 0;
 }
 
 sub add_medium_and_check {
-- 
cgit v1.2.1