aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-02 05:03:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-02 05:03:15 +0000
commit765f0f60610d8e3b44676dfbd3307563d3751e47 (patch)
tree7fad134fd5f1469e8c320548c30617c04ebeefeb
parent0d3a9ad6cdb7ee31c0b3b06c9012a79e37f01515 (diff)
downloadrpmtools-765f0f60610d8e3b44676dfbd3307563d3751e47.tar
rpmtools-765f0f60610d8e3b44676dfbd3307563d3751e47.tar.gz
rpmtools-765f0f60610d8e3b44676dfbd3307563d3751e47.tar.bz2
rpmtools-765f0f60610d8e3b44676dfbd3307563d3751e47.tar.xz
rpmtools-765f0f60610d8e3b44676dfbd3307563d3751e47.zip
Make rpm tools handle new keywords in hdlists file.
-rwxr-xr-xdistriblint3
-rwxr-xr-xgendistrib1
2 files changed, 3 insertions, 1 deletions
diff --git a/distriblint b/distriblint
index 5cea290..1fae09c 100755
--- a/distriblint
+++ b/distriblint
@@ -46,7 +46,8 @@ sub pass_get_hdlists {
chomp;
s/\s*#.*$//;
/^\s*$/ and next;
- m/^\s*(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die "invalid hdlist description \"$_\" in hdlists file";
+ /^(?:askmedia|suppl)/ and next;
+ m/^\s*(?:noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die "invalid hdlist description \"$_\" in hdlists file";
push @{$o->{hdlists}}, { synthesis => "$o->{root}/media/media_info/synthesis.$1",
hdlist => "$o->{root}/media/media_info/$1",
diff --git a/gendistrib b/gendistrib
index 639bd7d..4089788 100755
--- a/gendistrib
+++ b/gendistrib
@@ -84,6 +84,7 @@ foreach (<F>) {
chomp;
s/\s*#.*$//;
/^\s*$/ and next;
+ /^(?:askmedia|suppl)/ and next;
m/^\s*(?:noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die "invalid hdlist description \"$_\" in hdlists file";
push @hdlists, {