From d06a1c4a66bdac7f025174433cd233ef482cefc7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 28 Sep 2000 13:29:13 +0000
Subject: *** empty log message ***

---
 ChangeLog      | 4 ++++
 urpmi.addmedia | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 71e80c2a..dcca3722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-28  Pixel  <pixel@mandrakesoft.com>
+
+	* urpmi.addmedia: fix regexp for trying 2 mount mntpoint
+
 2000-09-21  Pixel  <pixel@mandrakesoft.com>
 
 	* urpmi.addmedia: try to mount the directory if file contains
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 3fa058a8..f95b5980 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -85,7 +85,7 @@ my $RPMLIST = "$DIR/list.$name";
 !-e $HDLIST || unlink $HDLIST or die "can't remove $HDLIST";
 
 if (my ($prefix, $dir) = $url =~ m,^(removable_.*?|file):/(.*),) {
-    if (!-e $dir && $dir =~ m|^(/mnt/.*?)|) {
+    if (!-e $dir && $dir =~ m|^(/mnt/[^/]*)|) {
 	$try2mount{$1} or $try2mount{$1} = 1, `mount $1 2>/dev/null`;
     }
     my $f;
-- 
cgit v1.2.1