(main): support "tlmgr help" (as an action) again.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 5210c0a3337..ec5838ba014 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -411,6 +411,7 @@ sub main {
 
   if (defined($action) && $action eq "help") {
     $opts{"help"} = 1;
+    $action = undef;  # an option not an action
   }
 
   if (defined($action) && $action eq "print-platform") {
@@ -418,19 +419,19 @@ sub main {
     exit 0;
   }
 
-  #
   # ACTION massaging
   # for backward compatibility and usability
 
   # unify arguments so that the $action contains paper in all cases
   # and push the first arg back to @ARGV for action_paper processing
-  if ($action =~ /^(paper|xdvi|psutils|pdftex|dvips|dvipdfmx?|context)$/) {
+  if (defined $action 
+      && $action =~ /^(paper|xdvi|psutils|pdftex|dvips|dvipdfmx?|context)$/) {
     unshift(@ARGV, $action);
     $action = "paper";
   }
 
   # backward compatibility with action "show" and "list" from before
-  if ($action =~ /^(show|list)$/) {
+  if (defined $action && $action =~ /^(show|list)$/) {
     $action = "info";
   }