summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-11-07 08:52:21 +0000
committerNorbert Preining <preining@logic.at>2007-11-07 08:52:21 +0000
commitbdd68d0d1d030fcf30a5aa4f0a68cbfcf522faf9 (patch)
tree26e46466285ecebc6eab7da69f42a9cf6e1c88a8 /Master/tlpkg
parent1c52ac9208bfcce5ea0e8979609988897125a729 (diff)
fix the "add the revision of tlpsrc file for collections/schemes", and
regenerate the texlive.tlpdb git-svn-id: svn://tug.org/texlive/trunk@5389 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm4
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm2
2 files changed, 4 insertions, 2 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index cdaa93b2db2..2d20c35e31e 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -207,7 +207,9 @@ sub recompute_revision {
$self->revision(($filemax > $self->revision) ? $filemax : $self->revision);
}
if (defined($revtlpsrc)) {
- $self->revision( $filemax > $revtlpsrc ? $filemax : $revtlpsrc );
+ if ($self->revision < $revtlpsrc) {
+ $self->revision($revtlpsrc);
+ }
}
}
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 030846abe6e..b90fc02847b 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -321,7 +321,7 @@ sub make_tlpobj
# file to the compute list:
my $addnr = 0;
if (($self->category eq "Collection") || ($self->category eq "Scheme")) {
- my $fn = "tlpk/tlpsrc/" . $self->name . ".tlpsrc";
+ my $fn = "tlpkg/tlpsrc/" . $self->name . ".tlpsrc";
$addnr = $tltree->file_svn_lastrevision($fn);
}
$tlp->recompute_revision($tltree, $addnr);