diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 17:37:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 17:37:17 +0000 |
| commit | b7360f3aa7903c1cf2169aa1631f9d2f0786882d (patch) | |
| tree | bf8bf52148014eaf2f52289ef547aef6118eb54b | |
| parent | bc9b5560369b2b94c1be40a5ac518a0f8b3d0f98 (diff) | |
| download | urpmi-b7360f3aa7903c1cf2169aa1631f9d2f0786882d.tar urpmi-b7360f3aa7903c1cf2169aa1631f9d2f0786882d.tar.gz urpmi-b7360f3aa7903c1cf2169aa1631f9d2f0786882d.tar.bz2 urpmi-b7360f3aa7903c1cf2169aa1631f9d2f0786882d.tar.xz urpmi-b7360f3aa7903c1cf2169aa1631f9d2f0786882d.zip | |
remove obsolete urpm::removable::copy_packages_of_removable_media(), call
urpm::cdrom::copy_packages_of_removable_media() directly
| -rw-r--r-- | urpm/main_loop.pm | 3 | ||||
| -rw-r--r-- | urpm/removable.pm | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index f9ac014e..9da3e3c6 100644 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -54,7 +54,8 @@ my %sources = %$local_sources; urpm::removable::try_mounting_non_cdroms($urpm, $list); $callbacks->{pre_removable} and $callbacks->{pre_removable}->(); -urpm::removable::copy_packages_of_removable_media($urpm, +require urpm::cdrom; +urpm::cdrom::copy_packages_of_removable_media($urpm, $list, \%sources, $callbacks->{copy_removable}); $callbacks->{post_removable} and $callbacks->{post_removable}->(); diff --git a/urpm/removable.pm b/urpm/removable.pm index e1c69469..6e392ddd 100644 --- a/urpm/removable.pm +++ b/urpm/removable.pm @@ -155,9 +155,4 @@ sub create_blists { } @$media ]; } -sub copy_packages_of_removable_media { - require urpm::cdrom; - &urpm::cdrom::copy_packages_of_removable_media; -} - 1; |