From bc3c3a8bf4666c9a1d7dbd9826836858230c2707 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 1 Oct 2012 16:18:16 +0000 Subject: (_try_mounting_cdrom_using_hal) rename it as_try_mounting_cdrom_using_udisks() --- urpm/cdrom.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'urpm') 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 -- cgit v1.2.1