From f1def83292058be5c38cde16ae8121aba20eade2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 26 Feb 2008 19:20:02 +0000
Subject: oops, fix previous "cleaning" commit, introduce _mounted_mntpoints()

---
 urpm/removable.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'urpm')

diff --git a/urpm/removable.pm b/urpm/removable.pm
index ed5dc63f..d4a95c90 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -50,8 +50,7 @@ sub try_umounting {
     my ($urpm, $dir) = @_;
 
     $dir = reduce_pathname($dir);
-    my @l = grep { $infos{$_}{mounted} } urpm::sys::find_mntpoints($dir, {});
-    foreach (reverse @l) {
+    foreach (reverse _mounted_mntpoints($dir)) {
 	$urpm->{log}(N("unmounting %s", $_));
 	sys_log("umount $_");
 	system("umount '$_' 2>/dev/null");
@@ -60,6 +59,12 @@ sub try_umounting {
     ! -e $dir;
 }
 
+sub _mounted_mntpoints {
+    my ($dir) = @_;
+    my %info;
+    grep { $infos{$_}{mounted} } urpm::sys::find_mntpoints($dir, \%info);
+}
+
 sub try_umounting_removables {
     my ($urpm) = @_;
     foreach (keys %{$urpm->{removable_mounted}}) {
-- 
cgit v1.2.1