diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-02-17 08:16:32 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-02-17 08:16:32 +0000 |
commit | f4422c6997bec8c526d88940b223a8d7ae7b392a (patch) | |
tree | ad97512b32e50f6e8285c975b468e5b3ccb6c094 | |
parent | ffd3d85a98a3b774cabd6384c29ca86ebf271262 (diff) | |
download | rpmtools-f4422c6997bec8c526d88940b223a8d7ae7b392a.tar rpmtools-f4422c6997bec8c526d88940b223a8d7ae7b392a.tar.gz rpmtools-f4422c6997bec8c526d88940b223a8d7ae7b392a.tar.bz2 rpmtools-f4422c6997bec8c526d88940b223a8d7ae7b392a.tar.xz rpmtools-f4422c6997bec8c526d88940b223a8d7ae7b392a.zip |
Handle new hdlists format (with sizes)
-rwxr-xr-x | gendistrib | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -87,13 +87,16 @@ foreach (<F>) { 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"; + my ($name, $dir, $descr) = m/^\s*(?:noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ + or die "invalid hdlist description \"$_\" in hdlists file"; + $descr =~ s/\([^(]+\)\s*$//; #- remove trailing size info + $descr =~ s/\s*$//; push @hdlists, { - synthesis => "$root/media/media_info/synthesis.$1", - hdlist => "$root/media/media_info/$1", - dir => $2, - descr => $3, + synthesis => "$root/media/media_info/synthesis.$name", + hdlist => "$root/media/media_info/$name", + dir => $dir, + descr => $descr, }; } close F; |