summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-01-07 20:09:28 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-01-07 20:09:28 +0000
commit83ab3faa780ece0593aeab6e46d277e727a095af (patch)
tree027607076c4c46b911ce5784c49751d8fd9335d7
parent8c7668a9014dc117fcb32a1ea87103094c3100d4 (diff)
downloadperl-MDV-Distribconf-83ab3faa780ece0593aeab6e46d277e727a095af.tar
perl-MDV-Distribconf-83ab3faa780ece0593aeab6e46d277e727a095af.tar.gz
perl-MDV-Distribconf-83ab3faa780ece0593aeab6e46d277e727a095af.tar.bz2
perl-MDV-Distribconf-83ab3faa780ece0593aeab6e46d277e727a095af.tar.xz
perl-MDV-Distribconf-83ab3faa780ece0593aeab6e46d277e727a095af.zip
fix so that default 'synthesis' value is generated from 'hdlist' value
-rw-r--r--lib/MDV/Distribconf.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/MDV/Distribconf.pm b/lib/MDV/Distribconf.pm
index b955304..e15ebe2 100644
--- a/lib/MDV/Distribconf.pm
+++ b/lib/MDV/Distribconf.pm
@@ -453,8 +453,14 @@ sub getvalue {
/^root$/ and return $distrib->{root};
/^(info|files|changelog)$/ and
return "$var." . lc($distrib->getvalue($media, 'name', $level)) . '.xml' . $distrib->getvalue(undef, 'xml-info-suffix');
- /^synthesis$/ and $default = 'synthesis.' . 'hdlist_' . lc($distrib->getvalue($media, 'name', $level)) .
- $distrib->getvalue(undef, 'synthesis-suffix');
+ /^synthesis$/ and do {
+ $default = 'synthesis.' . lc($distrib->getvalue($media, 'hdlist', $level));
+ # If compression (suffix) chosen differs from default .cz (gzip), be sure to use corresponding suffix
+ if ($default =~ /.*\.cz$/ and !($distrib->getvalue(undef, 'synthesis-suffix') eq ".cz")) {
+ $default =~ s/\.cz$//g;
+ $default .= $distrib->getvalue(undef, 'synthesis-suffix');
+ }
+ };
/^synthesis-filter$/ and $default = ".cz:gzip -9";
/^synthesis-suffix$/ and return (split ':', $distrib->getvalue(undef, 'synthesis-filter'))[0];
/^xml-info-filter$/ and $default = ".lzma:lzma -5";