From c166bd1de749851388581828d16ffa65493a4118 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 8 Jun 2012 18:51:23 +0000
Subject: (_handle_removable_media) split it out of run()

---
 urpm/main_loop.pm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 6e3c82ab..ec1a7619 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -163,6 +163,18 @@ sub _continue_on_error {
     return 1;
 }
 
+sub _handle_removable_media {
+    my ($urpm, $callbacks, $blists, $sources) = @_;
+    urpm::removable::try_mounting_non_cdroms($urpm, $blists);
+
+    $callbacks->{pre_removable} and $callbacks->{pre_removable}->();
+    require urpm::cdrom;
+    urpm::cdrom::copy_packages_of_removable_media($urpm,
+                                                  $blists, $sources,
+                                                  $callbacks->{copy_removable});
+    $callbacks->{post_removable} and $callbacks->{post_removable}->();
+}
+
 # locking is left to callers
 sub run {
     my ($urpm, $state, $something_was_to_be_done, $ask_unselect, $_requested, $callbacks) = @_;
@@ -183,14 +195,7 @@ sub run {
 
     my %sources = %$local_sources;
 
-    urpm::removable::try_mounting_non_cdroms($urpm, $blists);
-
-    $callbacks->{pre_removable} and $callbacks->{pre_removable}->();
-    require urpm::cdrom;
-    urpm::cdrom::copy_packages_of_removable_media($urpm,
-                                                  $blists, \%sources,
-                                                  $callbacks->{copy_removable});
-    $callbacks->{post_removable} and $callbacks->{post_removable}->();
+    _handle_removable_media($urpm, $callbacks, $blists, \%sources);
 
     if (exists $urpm->{options}{'download-all'}) {
         _download_all($urpm, $blists, \%sources, $force, $callbacks);
-- 
cgit v1.2.1