summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-01 16:18:22 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-01 16:18:22 +0000
commitdf5123679ef7ebbb718fc872af7c332e55903998 (patch)
tree2aeba4709d6e35b8721f8fdb322cc524e6636f79
parent4d8e56e91321985bbdbc9d5dbd03322b6c49e888 (diff)
downloadurpmi-df5123679ef7ebbb718fc872af7c332e55903998.tar
urpmi-df5123679ef7ebbb718fc872af7c332e55903998.tar.gz
urpmi-df5123679ef7ebbb718fc872af7c332e55903998.tar.bz2
urpmi-df5123679ef7ebbb718fc872af7c332e55903998.tar.xz
urpmi-df5123679ef7ebbb718fc872af7c332e55903998.zip
we use UDisks instead of Hal
-rw-r--r--urpm/cdrom.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpm/cdrom.pm b/urpm/cdrom.pm
index 511e4019..7408d8d2 100644
--- a/urpm/cdrom.pm
+++ b/urpm/cdrom.pm
@@ -60,7 +60,7 @@ sub try_mounting_cdrom {
my @blists;
- # first try without hal, it allows users where hal fails to work (with one CD only)
+ # first try without UDisks, it allows users where UDisks fails to work (with one CD only)
my @mntpoints = _look_for_mounted_cdrom_in_mtab();
@blists = map { _find_blist_matching($urpm, $blists, $_) } @mntpoints;
@@ -140,7 +140,7 @@ sub _eject_cdrom {
my $cdroms = Hal::Cdroms->new;
$cdroms->unmount($udisks_path) or do {
my $mntpoint = $cdroms->get_mount_point($udisks_path);
- #- trying harder. needed when the cdrom was not mounted by hal
+ #- trying harder. needed when the cdrom was not mounted by UDisks
$mntpoint && system("umount '$mntpoint' 2>/dev/null") == 0
or $urpm->{error}("failed to umount $udisks_path: $cdroms->{error}");
};