From a10837e75e1c04c36dcfc3167f5ce721f3658dc2 Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Wed, 16 Jan 2008 19:52:14 +0000
Subject: - handle cdmode flags in getdpath()

---
 lib/MDV/Distribconf.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/MDV')

diff --git a/lib/MDV/Distribconf.pm b/lib/MDV/Distribconf.pm
index 4829e89..d8be727 100644
--- a/lib/MDV/Distribconf.pm
+++ b/lib/MDV/Distribconf.pm
@@ -516,7 +516,6 @@ to the media for files having doble location (index for example).
 
 =cut
 
-
 sub getmediapath {
     my ($distrib, $media, $var) = @_;
     my %files = (
@@ -572,10 +571,11 @@ sub getdpath {
     my ($distrib, $media, $var) = @_;
 
     if ($var =~ /^(hdlist|synthesis|pubkey|MD5SUM)$/) {
-        if ($distrib->{type} eq 'mandriva') {
-            return $distrib->getmediapath($media, $var);
-        } else {
+        if ($distrib->getvalue($media, 'cdmode')
+            || $distrib->{type} eq 'mandrake') {
             return $distrib->getpath($media, $var);
+        } else {
+            return $distrib->getmediapath($media, $var);
         }
     } else {
         return $distrib->getpath($media, $var);
-- 
cgit v1.2.1