make tlmgr behave a bit more reasonable with --list

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

1 files changed, 7 insertions, 5 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 2dbed75cda2..56ecf1b105b 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1768,7 +1768,7 @@ sub action_update {
     }
   }
 
-  if (!$opts{"self"}) {
+  if (!$opts{"self"} || ($opts{"self"} && $opts{"list"})) {
     # update all .ARCH dependencies, too, unless $opts{"no-depends-at-all"}:
     @todo = $tlmediatlpdb->expand_dependencies("-only-arch", $localtlpdb, @todo)
       unless $opts{"no-depends-at-all"};
@@ -2221,7 +2221,9 @@ sub action_update {
   # them have been successfully updated
   my $infra_update_done = 1;
   my @infra_files_to_be_removed;
-  if (!$opts{"list"}) {
+  if ($opts{"list"}) {
+    $infra_update_done = 0;
+  } else {
     for my $pkg (@critical) {
       next unless (defined($updated{$pkg}));
       $infra_update_done &&= $updated{$pkg};
@@ -2279,7 +2281,7 @@ sub action_update {
         debug("removing disappearing file $f\n");
       }
     } 
-  } # end of if (!$opts{"list"})
+  } # end of if ($opts{"list"}) ... else part
 
   # check if any additional updates are asked for
   my $other_updates_asked_for = 0;
@@ -2295,7 +2297,7 @@ sub action_update {
   }
 
   my $restart_tlmgr = 0;
-  if ($opts{"self"} && @critical && 
+  if ($opts{"self"} && @critical &&
       $infra_update_done && $other_updates_asked_for) {
     # weed out the --self argument from the saved arguments
     @::SAVEDARGV = grep (!m/^-?-self$/, @::SAVEDARGV);
@@ -2317,7 +2319,7 @@ sub action_update {
   }
 
   # only when we are not dry-running we restart the program
-  if (!win32() && $restart_tlmgr && !$opts{"dry-run"}) {
+  if (!win32() && $restart_tlmgr && !$opts{"dry-run"} && !$opts{"list"}) {
     info ("Restarting tlmgr to complete update ...\n");
     debug("restarting tlmgr @::SAVEDARGV\n");
     exec("tlmgr", @::SAVEDARGV);