make explicit package names cause a temporary run

git-svn-id: svn://tug.org/texlive/trunk@16040 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 9 deletions

diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb
index 7904930df42..8708e2f1766 100755
--- a/Master/tlpkg/bin/tl-update-tlpdb
+++ b/Master/tlpkg/bin/tl-update-tlpdb
@@ -30,7 +30,7 @@ my $help = 0;
 my $opt_nobinsplit = 0;
 my $opt_w32warning;
 my $opt_fromfiles = 0;
-my $opt_norevisioncheck = 0;
+my $opt_no_revision_check = 0;
 my $opt_tlpsrc_from_cmdline = 0;
 my $opt_output;
 my $opt_fix_reverse_revisions = 0;  # needs svn commit
@@ -45,7 +45,7 @@ GetOptions(
     "master=s"                   => \$opt_master,
     "no-bin-split!"              => \$opt_nobinsplit,
     "no-commit!"                 => \$opt_no_commit,
-    "no-reverse-revision-check!" => \$opt_norevisioncheck,
+    "no-reverse-revision-check!" => \$opt_no_revision_check,
     "output=s"                   => \$opt_output,
     "save-anyway!"               => \$opt_save_anyway,
     "tlpsrc-from-cmdline"        => \$opt_tlpsrc_from_cmdline,
@@ -81,8 +81,8 @@ sub main
     info ("$progname: No checking on increasing revisions, no old tlpdb found\n");
     finish ($newtlpdb, $pkgcount);
   }
-  if ($opt_norevisioncheck) {
-    info ("$progname: No checking on increasing revisions due to --no-reverse-revision-check\n");
+  if ($opt_no_revision_check) {
+    info ("$progname: Not checking increasing revisions due to --no-reverse-revision-check\n");
     finish ($newtlpdb, $pkgcount);
   }
   # compare_tlpdbs returns true if some reversed revisions have been found.
@@ -197,7 +197,7 @@ sub compare_and_fix_tlpdbs
   }
   if ($opt_no_commit) {
     if ($commitit) {
-      tlwarn("$progname: tlpsrc files have been change but not committed.\n");
+      tlwarn("$progname: tlpsrc files have been changed but not committed.\n");
       tlwarn("$progname: svn status output follows:\n");
       my $r = `svn status $opt_master/tlpkg/tlpsrc 2>&1`;
       tlwarn($r . "\n");
@@ -227,11 +227,14 @@ sub create_tlpdb
   my $tlpsrc_dir = "$opt_master/tlpkg/tlpsrc";
 
   if (@ARGV) {
-    # if we have cmd line arguments act as if --tlpsrc-from-cmdline was given
+    # if we have cmd line arguments act as if --tlpsrc-from-cmdline was given.
     if (!$opt_tlpsrc_from_cmdline) {
-      tlwarn("$progname: additional arguments on cmd line,\n");
-      tlwarn("$progname: acting as if --tlpsrc-from-cmdline was given.\n");
+      tlwarn ("$progname: generating tlpdb in /tmp/tlut for @ARGV,\n");
+      tlwarn ("$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";
     }
   }
   if (!$opt_tlpsrc_from_cmdline) {
@@ -263,7 +266,7 @@ sub create_tlpdb
     my $tlp = $tlsrc->make_tlpobj ($tltree, $opt_master);
 
     (my $base_f = $f) =~ s/\.tlpsrc$//;
-    $base_f = TeXLive::TLUtils::basename($base_f);
+    $base_f = TeXLive::TLUtils::basename ($base_f);
     warn "$f: package name " . $tlp->name . " does not match filename\n"
       if $tlp->name ne $base_f;