summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-29 10:24:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-29 10:24:40 +0000
commit3ed571a73be34a994d08c0967ee72632000e5632 (patch)
treeb6339569ef9a07cb5ce2fbf24cb3a23ff60c7081
parent27d28171e298b56a18e94514694c116c2c30a22d (diff)
downloadurpmi-3ed571a73be34a994d08c0967ee72632000e5632.tar
urpmi-3ed571a73be34a994d08c0967ee72632000e5632.tar.gz
urpmi-3ed571a73be34a994d08c0967ee72632000e5632.tar.bz2
urpmi-3ed571a73be34a994d08c0967ee72632000e5632.tar.xz
urpmi-3ed571a73be34a994d08c0967ee72632000e5632.zip
- rename _mount_it() into _mount_cdrom()
- rename _mount_and_check_notfound() into _mount_cdrom_and_check_notfound() - in _mount_cdrom_and_check_notfound, use _try_mounting_medium since failure to mount is not fatal
-rw-r--r--urpm/removable.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/urpm/removable.pm b/urpm/removable.pm
index 91acd837..143f01ab 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -147,12 +147,12 @@ sub try_umounting_removables {
}
#- side-effects:
-#- + those of try_mounting_medium ($medium->{mntpoint})
-sub _mount_and_check_notfound {
+#- + those of _try_mounting_medium ($medium->{mntpoint})
+sub _mount_cdrom_and_check_notfound {
my ($urpm, $blist, $medium) = @_;
my ($first_url) = values %{$blist->{list}};
- try_mounting_medium($urpm, $medium, $first_url) or return 1;
+ _try_mounting_medium($urpm, $medium, $first_url) or return 1;
_check_notfound($blist);
}
@@ -169,16 +169,16 @@ sub _check_notfound {
}
#- side-effects: "eject"
-#- + those of _mount_and_check_notfound ($urpm->{removable_mounted}, "mount")
+#- + those of _mount_cdrom_and_check_notfound ($urpm->{removable_mounted}, "mount")
#- + those of try_umounting ($urpm->{removable_mounted}, "umount")
-sub _mount_it {
+sub _mount_cdrom {
my ($urpm, $blist, $ask_for_medium) = @_;
my $medium = $blist->{medium};
#- the directory given does not exist and may be accessible
#- by mounting some other directory. Try to figure it out and mount
#- everything that might be necessary.
- while (_mount_and_check_notfound($urpm, $blist, $medium)) {
+ while (_mount_cdrom_and_check_notfound($urpm, $blist, $medium)) {
$ask_for_medium
or $urpm->{fatal}(4, N("medium \"%s\" is not available", $medium->{name}));
@@ -217,12 +217,12 @@ sub _do_the_copy {
}
#- side-effects: $sources
-#- + those of _mount_it ($urpm->{removable_mounted}, "mount", "umount", "eject")
+#- + those of _mount_cdrom ($urpm->{removable_mounted}, "mount", "umount", "eject")
#- + those of _do_the_copy: "copy-move-files"
sub _copy_from_cdrom__if_needed {
my ($urpm, $blist, $sources, $ask_for_medium, $want_copy) = @_;
- _mount_it($urpm, $blist, $ask_for_medium);
+ _mount_cdrom($urpm, $blist, $ask_for_medium);
while (my ($i, $url) = each %{$blist->{list}}) {
my $filepath = _filepath($blist->{medium}, $url) or next;