diff options
author | Norbert Preining <preining@logic.at> | 2009-09-10 10:51:46 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2009-09-10 10:51:46 +0000 |
commit | c59047eaf449bc74496a3ab5f3b39aade149b683 (patch) | |
tree | d023f07cf746175c08c1c63876418d4568b99d8a /Master/tlpkg | |
parent | a2d6cf0ff1e81b20a2797ea6effae73b342014f5 (diff) |
make some changes to tl-update-tlpdb:
- if the old texlive.tlpdb is not readable do not try to load it (it will
boil down to die in TLPDB.pm)
- do not call the compare_tlpdb if --from-files was given, there will be
dummy revision numbers
git-svn-id: svn://tug.org/texlive/trunk@15206 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlpdb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb index f28505563da..3f0dcafe992 100755 --- a/Master/tlpkg/bin/tl-update-tlpdb +++ b/Master/tlpkg/bin/tl-update-tlpdb @@ -88,7 +88,10 @@ sub main $tlc = TeXLive::TeXCatalogue->new ("location" => $opt_catalogue); } - my $oldtlpdb = TeXLive::TLPDB->new ("root" => $opt_master); + my $oldtlpdb; + if (-r "$opt_master/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb") { + $oldtlpdb = TeXLive::TLPDB->new ("root" => $opt_master); + } my ($newtlpdb, $pkgcount) = create_tlpdb($tlc); if (!defined($oldtlpdb)) { info("No checking on increasing revisions, no old tlpdb found\n"); @@ -98,7 +101,10 @@ sub main info("No checking on increasing revisions due to --no-revision-check\n"); finish($newtlpdb, $pkgcount); } - if (compare_tlpdbs($oldtlpdb, $newtlpdb)) { + # if compare_tlpdbs returns true then some reversed revisions have been + # found. Only if we are starting from svn we can check in new changes + # so do not recreate the tlpdb if $opt_fromfiles is unset + if (compare_tlpdbs($oldtlpdb, $newtlpdb) && !$opt_fromfiles) { # compare_tlpdbs checks in dummy changes to the tlpsrc files # now we check again and that should not give any changes! ($newtlpdb, $pkgcount) = create_tlpdb($tlc); |