summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-17 22:48:14 +0000
committerKarl Berry <karl@freefriends.org>2010-09-17 22:48:14 +0000
commitda06f544fa0538009aa0dde47182706978d30869 (patch)
treec6e4d083b3acfbf008d80184dc1a231d5ae5963e /Master/tlpkg/TeXLive
parent1d7ffa88b82414553dfd89518c43ee252200b319 (diff)
allow and ignore whitespace after shortdesc, even
if nothing else. git-svn-id: svn://tug.org/texlive/trunk@19777 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive')
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 497367b3d7a..3b6a74f5cc1 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -261,11 +261,11 @@ sub from_fh {
$self->{'cataloguedata'}{$1} = "$2";
} elsif ($line =~ /^catalogue-([^\s]+)\s*/o) {
1; # ignore e.g. catalogue-ctan without parameter
- } elsif ($line eq "shortdesc") {
+ } elsif ($line =~ /^shortdesc\s*$/o) { # shortdesc<whitespace>
$self->{'shortdesc'} .= " ";
$lastcmd = "shortdesc";
next;
- } elsif ($line =~ /^shortdesc\s+(.*)$/o) {
+ } elsif ($line =~ /^shortdesc\s+(.*)$/o) { # shortdesc <real text>
$self->{'shortdesc'} .= "$1";
$lastcmd = "shortdesc";
next;