diff options
author | Norbert Preining <preining@logic.at> | 2010-09-17 02:35:37 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2010-09-17 02:35:37 +0000 |
commit | 9838d699ec836e6d0d1e811c43f8e2ea3991a7b2 (patch) | |
tree | f61f1693312be8db118635fd691269fb42243b56 | |
parent | 495a87e8b82a51518b29bf3186026b96f4e30221 (diff) |
allow for empty shortdesc lines
git-svn-id: svn://tug.org/texlive/trunk@19771 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 4 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 5e3804d87a6..497367b3d7a 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -261,6 +261,10 @@ 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") { + $self->{'shortdesc'} .= " "; + $lastcmd = "shortdesc"; + next; } elsif ($line =~ /^shortdesc\s+(.*)$/o) { $self->{'shortdesc'} .= "$1"; $lastcmd = "shortdesc"; diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index ac07d969b87..52779211a8b 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -125,6 +125,9 @@ sub from_file if ($line =~ /^shortdesc\s*(.*)$/) { $shortdesc = $1; next; + } elsif ($line =~ /^shortdesc$/) { + $shortdesc = ""; + next; } elsif ($line =~ /^category\s+$CategoriesRegexp$/) { $category = $1; next; |