fixes

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

3 files changed, 8 insertions, 6 deletions

diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index a81dea15635..82f6ba1b325 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -2217,7 +2217,7 @@ Error message from creating MainWindow:
   # another GUI instance (or better trying to ...)
   $opts{"gui"} = 0;
 
-  require("tlmgrgui2.pl");
+  require("tlmgrgui.pl");
   # should not be reached
   exit(1);
 }
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
index f7c62645730..6152ea8ece2 100644
--- a/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/do_listframe.pl
@@ -178,13 +178,13 @@ sub do_listframe {
   my $f_buttonf_optionsf = $f_buttonf->Frame();
   if ($with_force) {
     my $foo = $f_buttonf_optionsf->Checkbutton(-text => ___"force", 
-                                     -variable => \$opt_force
+                                     -variable => \$opts{"force"}
                                     )->pack(-side => 'left');
     $balloon->attach($foo,-balloonmsg => ___"forceballoon");
   }
   if ($with_deps) {
     my $foo = $f_buttonf_optionsf->Checkbutton(-text => ___"withoutdep", 
-                                   -variable => \$opt_nodepends
+                                   -variable => \$opts{"no-depends"}
                                   )->pack(-side => 'left');
     $balloon->attach($foo,-balloonmsg => ___"nodepballoon");
   }
diff --git a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
index bfe2df695f4..b49bb9ae78c 100755
--- a/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
+++ b/Master/texmf/scripts/texlive/tlmgrgui/tlmgrgui.pl
@@ -449,7 +449,6 @@ sub run_program_show_output {
 sub install_selected_packages {
   if (@_) {
     my @args = qw/install/;
-    push @args, "-force" if $opt_force;
     push @args, @_;
     execute_action_gui(@args);
     reinit_local_tlpdb();
@@ -486,7 +485,11 @@ sub update_selected_packages {
       }
     }
     my @args = qw/update/;
-    push @args, "-force" if $opt_force;
+    # argument processing
+    if ($_[0] eq "--all") {
+      $opts{"all"} = 1;
+      shift;
+    }
     push @args, @_;
     execute_action_gui(@args);
     if (win32() && $updater_needed) {
@@ -513,7 +516,6 @@ sub update_selected_packages {
 sub remove_selected_packages {
   if (@_) {
     my @args = qw/remove/;
-    push @args, "-force" if $opt_force;
     push @args, @_;
     execute_action_gui(@args);
     reinit_local_tlpdb();