summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-01 16:18:16 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-01 16:18:16 +0000
commitbc3c3a8bf4666c9a1d7dbd9826836858230c2707 (patch)
tree29760908f2528d3d950b914a20785df6f60081fd
parentf24a9c24e45edc9d777b8089d7d0e20bc498e0fe (diff)
downloadurpmi-bc3c3a8bf4666c9a1d7dbd9826836858230c2707.tar
urpmi-bc3c3a8bf4666c9a1d7dbd9826836858230c2707.tar.gz
urpmi-bc3c3a8bf4666c9a1d7dbd9826836858230c2707.tar.bz2
urpmi-bc3c3a8bf4666c9a1d7dbd9826836858230c2707.tar.xz
urpmi-bc3c3a8bf4666c9a1d7dbd9826836858230c2707.zip
(_try_mounting_cdrom_using_hal) rename it as_try_mounting_cdrom_using_udisks()
-rw-r--r--urpm/cdrom.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm
index 616cd47b..88554f88 100644
--- a/urpm/cdrom.pm
+++ b/urpm/cdrom.pm
@@ -53,7 +53,7 @@ sub _look_for_mounted_cdrom_in_mtab() {
}
#- side-effects:
-#- + those of _try_mounting_cdrom_using_hal ($urpm->{cdrom_mounted}, "hal_mount")
+#- + those of _try_mounting_cdrom_using_udisks ($urpm->{cdrom_mounted}, "hal_mount")
#- + those of _find_blist_matching ($blists->[_]{medium}{mntpoint})
sub try_mounting_cdrom {
my ($urpm, $blists) = @_;
@@ -65,14 +65,14 @@ sub try_mounting_cdrom {
@blists = map { _find_blist_matching($urpm, $blists, $_) } @mntpoints;
if (!@blists) {
- @mntpoints = _try_mounting_cdrom_using_hal($urpm);
+ @mntpoints = _try_mounting_cdrom_using_udisks($urpm);
@blists = map { _find_blist_matching($urpm, $blists, $_) } @mntpoints;
}
@blists;
}
#- side-effects: $urpm->{cdrom_mounted}, "hal_mount"
-sub _try_mounting_cdrom_using_hal {
+sub _try_mounting_cdrom_using_udisks {
my ($urpm) = @_;
$urpm->{cdrom_mounted} = {}; # reset