summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-16 21:24:20 +0000
committerNorbert Preining <preining@logic.at>2008-06-16 21:24:20 +0000
commit6c3be42e12b70a4a4151b37fc73309fe35132d04 (patch)
tree8540516efba0f64401b0f47d2258417970b16ae5
parent87f092705ce2c745e18816998cc5b63835b375c2 (diff)
TLPOBJ: allow spaces at the end of a line, and ignore them
git-svn-id: svn://tug.org/texlive/trunk@8797 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm20
1 files changed, 10 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 83fbf80962d..8228f4331a2 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -109,10 +109,10 @@ sub from_fh {
$started = 1;
} else {
$started || die("First directive needs to be 'name', not $line");
- if ($line =~ /^(src|run)filescontinued\s+(.*)/o) {
+ if ($line =~ /^(src|run)filescontinued\s+(.*)\s*/o) {
push @{$self->{$1."files"}}, "$2";
next;
- } elsif ($line =~ /^docfilescontinued\s+(.*)/o) {
+ } elsif ($line =~ /^docfilescontinued\s+(.*)\s*/o) {
# docfiles can have tags
my @words = &TeXLive::TLUtils::quotewords('\s+', 0, "$1");
# the first entry is the file
@@ -129,7 +129,7 @@ sub from_fh {
}
}
next;
- } elsif ($line =~ /^binfilescontinued\s+(.*)/o) {
+ } elsif ($line =~ /^binfilescontinued\s+(.*)\s*/o) {
push @{$self->{'binfiles'}{$arch}}, "$1";
next;
} elsif ($line =~ /^binfiles\s+/o) {
@@ -151,7 +151,7 @@ sub from_fh {
}
$lastcmd = "binfiles";
next;
- } elsif ($line =~ /^longdesc\s+(.*)/o) {
+ } elsif ($line =~ /^longdesc\s+(.*)\s*/o) {
if (defined($self->{'longdesc'})) {
$self->{'longdesc'} .= " $1";
} else {
@@ -163,11 +163,11 @@ sub from_fh {
$self->{'category'} = "$1";
$lastcmd = "category";
next;
- } elsif ($line =~ /^revision\s+(.*)/o) {
+ } elsif ($line =~ /^revision\s+(.*)\s*/o) {
$self->{'revision'} = "$1";
$lastcmd = "revision";
next;
- } elsif ($line =~ /^catalogue\s+(.*)/o) {
+ } elsif ($line =~ /^catalogue\s+(.*)\s*/o) {
$self->catalogue("$1");
$lastcmd = "catalogue";
next;
@@ -188,17 +188,17 @@ sub from_fh {
$self->{"${type}size"} = $size;
}
next;
- } elsif ($line =~ /^execute(continued)?\s*(.*)/o) {
+ } elsif ($line =~ /^execute(continued)?\s*(.*)\s*/o) {
push @{$self->{'executes'}}, "$2" unless "$2" eq "";
$lastcmd = "execute";
next;
- } elsif ($line =~ /^depend(continued)?\s*(.*)/o) {
+ } elsif ($line =~ /^depend(continued)?\s*(.*)\s*/o) {
push @{$self->{'depends'}}, "$2" unless "$2" eq "";
$lastcmd = "depend";
next;
- } elsif ($line =~ /^catalogue-([^\s]+)\s+(.*)/o) {
+ } elsif ($line =~ /^catalogue-([^\s]+)\s+(.*)\s*/o) {
$self->{'cataloguedata'}{$1} = "$2";
- } elsif ($line =~ /^shortdesc\s+(.*)/o) {
+ } elsif ($line =~ /^shortdesc\s+(.*)\s*/o) {
$self->{'shortdesc'} .= "$1";
$lastcmd = "shortdesc";
next;