From de59ae3c7f6be0b16b052a5d1f798aed1b4323a9 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 1 Apr 2008 12:53:25 +0000
Subject: - urpmf   o in some cases (iso on disk), the hdlist is not available
 in     media/xxx/media_info/, but we can use the statedir copy. So use it

---
 NEWS          | 2 ++
 urpm/media.pm | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index ca8fa964..7d96e6ff 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@
 - urpmf:
   o check usage of -a, -! and the like instead of displaying the ugly
     "Internal error: syntax error ..."
+  o in some cases (iso on disk), the hdlist is not available in
+    media/xxx/media_info/, but we can use the statedir copy. So use it
 
 Version 5.17 - 28 March 2008, by Pascal "Pixel" Rigaux
 
diff --git a/urpm/media.pm b/urpm/media.pm
index 1d49f8b0..230946cd 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -352,6 +352,12 @@ sub any_media_info_file {
 	  ? reduce_pathname("$base/$prefix." . _synthesis_suffix($medium) . $suffix)
 	  : _synthesis_dir($medium) . "/$prefix$suffix";
 
+	if (! -e $f) {
+	    # in some weird cases (iso on disk), the hdlist is not available where it should be,
+	    # but we can use the statedir copy
+	    $f = "$urpm->{statedir}/$prefix.$medium->{name}$suffix";
+	}
+
 	-e $f && $f;
     } else {
 	_any_media_info__or_download($urpm, $medium, $prefix, $suffix, $quiet, $o_callback);
-- 
cgit v1.2.1