summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2008-01-16 19:52:14 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2008-01-16 19:52:14 +0000
commita10837e75e1c04c36dcfc3167f5ce721f3658dc2 (patch)
tree9bbc3fd67fdf12e8e63409008e33801df06a6ef3 /lib
parent926d786814eb89ecf65d5d9c498dd7006e8e5ada (diff)
downloadperl-MDV-Distribconf-a10837e75e1c04c36dcfc3167f5ce721f3658dc2.tar
perl-MDV-Distribconf-a10837e75e1c04c36dcfc3167f5ce721f3658dc2.tar.gz
perl-MDV-Distribconf-a10837e75e1c04c36dcfc3167f5ce721f3658dc2.tar.bz2
perl-MDV-Distribconf-a10837e75e1c04c36dcfc3167f5ce721f3658dc2.tar.xz
perl-MDV-Distribconf-a10837e75e1c04c36dcfc3167f5ce721f3658dc2.zip
- handle cdmode flags in getdpath()
Diffstat (limited to 'lib')
-rw-r--r--lib/MDV/Distribconf.pm8
1 files changed, 4 insertions, 4 deletions
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);