From fb6e321b3f3aee499b7e6f0eb4bb0172baf8a0c3 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 3 Mar 2003 13:34:48 +0000
Subject: 4.2-27mdk

---
 urpm.pm    | 4 ++--
 urpmi.spec | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/urpm.pm b/urpm.pm
index 0e3ab2ab..c8ed13a9 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1794,7 +1794,7 @@ sub try_mounting {
     my %infos;
 
     $dir = reduce_pathname($dir);
-    foreach (grep { ! $infos{$_}{mounted} } $urpm->find_mntpoints($dir, \%infos)) {
+    foreach (grep { ! $infos{$_}{mounted} && $infos{$_}{fs} ne 'supermount' } $urpm->find_mntpoints($dir, \%infos)) {
 	$urpm->{log}(_("mounting %s", $_));
 	`mount '$_' 2>/dev/null`;
 	$removable && $infos{$_}{fs} ne 'supermount' and $urpm->{removable_mounted}{$_} = undef;
@@ -1807,7 +1807,7 @@ sub try_umounting {
     my %infos;
 
     $dir = reduce_pathname($dir);
-    foreach ($urpm->find_mntpoints($dir, 'umount')) {
+    foreach (reverse grep { $infos{$_}{mounted} && $infos{$_}{fs} ne 'supermount' } $urpm->find_mntpoints($dir, \%infos)) {
 	$urpm->{log}(_("unmounting %s", $_));
 	`umount '$_' 2>/dev/null`;
 	delete $urpm->{removable_mounted}{$_};
diff --git a/urpmi.spec b/urpmi.spec
index a18deb4c..29ca1edc 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 4.2
-Release: 26mdk
+Release: 27mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -206,6 +206,9 @@ fi
 
 
 %changelog
+* Mon Mar  3 2003 François Pons <fpons@mandrakesoft.com> 4.2-27mdk
+- avoid mounting or unmounting a supermounted device.
+
 * Fri Feb 28 2003 Pons François <fpons@mandrakesoft.com> 4.2-26mdk
 - added sanity check of list file used (fix bug 2110 by providing
   a reason why there could be download error).
-- 
cgit v1.2.1