- urpmi, urpme, urpmq, urpmf:

  o fix --use-distrib

(and add test to ensure it never breaks again)

3 files changed, 10 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index c3bc5b77..36cc78e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi, urpme, urpmq, urpmf:
+  o fix --use-distrib
+
 Version 5.3 - 4 February 2008, by Pascal "Pixel" Rigaux
 
 - urpmi.cfg:
diff --git a/t/superuser--addmedia.t b/t/superuser--addmedia.t
index 9e7ce17f..63b9fb34 100644
--- a/t/superuser--addmedia.t
+++ b/t/superuser--addmedia.t
@@ -63,6 +63,7 @@ try_distrib_removable({
 	      with_synthesis3 => "../..//media/media_info/synthesis.hdlist_$name3.cz" }, 
 	    '--probe-synthesis');
 
+try_use_distrib();
 
 sub try_medium {
     my ($want, $options, $o_options2) = @_;
@@ -119,6 +120,11 @@ sub try_distrib_ {
     urpmi_removemedia('-a');
 }
 
+sub try_use_distrib {
+    urpmi("--use-distrib $::pwd $name $name2");
+    check_installed_and_remove($name, $name2);
+}
+
 sub try_distrib_removable_ {
     my ($want, $want2, $want3, $options) = @_;
 
diff --git a/urpm/media.pm b/urpm/media.pm
index b2367ccb..0cf29f9c 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -623,7 +623,7 @@ sub add_medium {
 
     if ($with_synthesis) {
 	_migrate__with_synthesis($medium, $with_synthesis);
-    } else {
+    } elsif (!$medium->{media_info_dir}) {
 	$medium->{unknown_media_info} = 1;
     }