summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-26 19:13:51 +0000
committerKarl Berry <karl@freefriends.org>2009-11-26 19:13:51 +0000
commit4d30a52e12d8096007b9fbdae8311e7551b731e5 (patch)
treed2822f6a15e47911c259feeb2eb957d6495bf644 /Master/tlpkg
parent8774983250625aa5257e374e94f95bc377b1c3f1 (diff)
(create_tlpdb): must not mess with options here,
we are called after fixing reverse revisions. Sigh. git-svn-id: svn://tug.org/texlive/trunk@16176 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlpdb27
1 files changed, 16 insertions, 11 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb
index 8708e2f1766..c36dc1e0d42 100755
--- a/Master/tlpkg/bin/tl-update-tlpdb
+++ b/Master/tlpkg/bin/tl-update-tlpdb
@@ -96,20 +96,24 @@ sub main
# --fix-reverse-revisions has been given
#
# if we are running from svn (no --from-files is given) and we try
- # to fix revisions (--fix-reverse-revisions) is given, and we do
- # commit the changes (!$opt_no_commit), then we recreate the tlpdb
+ # to fix revisions (--fix-reverse-revisions is given), and we do
+ # commit the changes (--no_commit is not given), then we recreate the tlpdb
#
if (!$opt_fromfiles && $opt_fix_reverse_revisions && !$opt_no_commit) {
+ info ("$progname: Regenerating tlpdb after fixing");
($newtlpdb, $pkgcount) = create_tlpdb($tlc);
#
# now recheck, but do NOT try to check in changes again by unsetting
# $opt_fix_reverse_revisions
$opt_fix_reverse_revisions = 0;
if (compare_and_fix_tlpdbs($oldtlpdb, $newtlpdb)) {
- tlwarn("$progname: That should not happen, after one iteration of compare_tlpdbs\nthe newly created tlpdb is still going backwards in time.\nPlease check output above!\n");
+ tlwarn ("$progname: oops, should not happen!"
+ . " After one iteration of compare_tlpdbs\n"
+ . " the new tlpdb is still going backwards in time.\n"
+ . " Check output above and fix!\n");
# $buggy_tlpdb is already set to 1
} else {
- # fixing did succeed
+ # fixing succeeded
$buggy_tlpdb = 0;
}
}
@@ -220,7 +224,8 @@ sub compare_and_fix_tlpdbs
sub create_tlpdb
{
- my $tlc = shift;
+ my ($tlc) = @_;
+
if (defined($opt_w32warning)) {
$::tlpsrc_pattern_warn_win = 1;
}
@@ -229,18 +234,18 @@ sub create_tlpdb
if (@ARGV) {
# if we have cmd line arguments act as if --tlpsrc-from-cmdline was given.
if (!$opt_tlpsrc_from_cmdline) {
- tlwarn ("$progname: generating tlpdb in /tmp/tlut for @ARGV,\n");
- tlwarn ("$progname: no commits, no rev check.\n");
+ info ("$progname: generating tlpdb in /tmp/tlut for @ARGV,\n");
+ info ("$progname: no commits, no rev check.\n");
$opt_tlpsrc_from_cmdline = 1;
- $opt_no_commit = 1;
- $opt_no_revision_check = 1;
- $opt_output = "/tmp/tlut";
+ #$opt_no_commit = 1;
+ #$opt_no_revision_check = 1;
+ #$opt_output = "/tmp/tlut";
}
}
if (!$opt_tlpsrc_from_cmdline) {
# if not otherwise given use all tlpsrc files
- # if we're regenerating the whole thing, get all our tlpsrc files.
+ # if regenerating the whole thing, push all tlpsrc files onto @ARGV.
chdir ($tlpsrc_dir) || die "chdir($tlpsrc_dir) failed: $!";
@ARGV = glob ("*.tlpsrc");
}