summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2014-01-26 12:04:58 +0000
committerNorbert Preining <preining@logic.at>2014-01-26 12:04:58 +0000
commit61d7ebde44abc33faa26fa3312df24d45954d17a (patch)
tree7bbc3007205ee391f4a01c31604a2b41b6529dac /Master/texmf-dist/scripts
parent19cc203ae1bd6ac2cf0a04b0d02fad76e5f8c563 (diff)
fix double message on critical updates, and simplify messages
git-svn-id: svn://tug.org/texlive/trunk@32792 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rw-r--r--Master/texmf-dist/scripts/texlive/tlmgrgui.pl50
1 files changed, 23 insertions, 27 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
index 25b7148d7b5..dbe760fdb4f 100644
--- a/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgrgui.pl
@@ -1897,7 +1897,8 @@ sub install_selected_packages {
my @foo = SelectedPackages();
if (@foo) {
# that doesn't hurt if it is already loaded
- init_install_media();
+ # it does hurt when there are critical updates ... so don't do it
+ #init_install_media();
my @args = qw/install/;
push @args, @foo;
execute_action_gui(@args);
@@ -1927,6 +1928,21 @@ sub SelectedPackages {
return @ret;
}
+sub critical_updates_done_msg_and_end {
+ # terminate here immediately so that we are sure the auto-updater
+ # is run immediately
+ # make sure we exit in finish(0)
+ $::gui_mode = 0;
+ # warn that program will now be terminated
+ $mw->Dialog(-title => __("Warning"),
+ -text => __("Critical updates have been installed.\nProgram will terminate now.\nPlease restart if necessary."),
+ -buttons => [ __("Ok") ])->Show;
+ # also delete the main window before we kill the process to
+ # make sure that Tk is happy (segfault on cmd line, email Taco)
+ $mw->destroy;
+ finish(0);
+}
+
sub update_all_packages {
my @args = qw/update/;
if (@critical_updates) {
@@ -1935,21 +1951,11 @@ sub update_all_packages {
$opts{"all"} = 1;
}
# that doesn't hurt if it is already loaded
- init_install_media();
+ # it does hurt when there are critical updates ... so don't do it
+ #init_install_media();
execute_action_gui(qw/update/);
if (@critical_updates) {
- # terminate here immediately so that we are sure the auto-updater
- # is run immediately
- # make sure we exit in finish(0)
- $::gui_mode = 0;
- # warn that program will now be terminated
- $mw->Dialog(-title => __("Warning"),
- -text => __("Critical updates have been installed.\nProgram will terminate now.\nPlease restart if necessary."),
- -buttons => [ __("Ok") ])->Show;
- # also delete the main window before we kill the process to
- # make sure that Tk is happy (segfault on cmd line, email Taco)
- $mw->destroy;
- finish(0);
+ critical_updates_done_msg_and_end();
}
reinit_local_tlpdb();
}
@@ -1958,7 +1964,8 @@ sub update_selected_packages {
my @foo = SelectedPackages();
if (@foo) {
# that doesn't hurt if it is already loaded
- init_install_media();
+ # it does hurt when there are critical updates ... so don't do it
+ #init_install_media();
my @args = qw/update/;
# argument processing
# in case we have critical updates present we do put the list of
@@ -1969,18 +1976,7 @@ sub update_selected_packages {
push @args, @foo;
execute_action_gui(@args);
if (@critical_updates) {
- # terminate here immediately so that we are sure the auto-updater
- # is run immediately
- # make sure we exit in finish(0)
- $::gui_mode = 0;
- # warn that program will now be terminated
- $mw->Dialog(-title => __("Warning"),
- -text => __("Critical updates have been installed.\nProgram will terminate now.\nPlease restart if necessary."),
- -buttons => [ __("Ok") ])->Show;
- # also delete the main window before we kill the process to
- # make sure that Tk is happy (segfault on cmd line, email Taco)
- $mw->destroy;
- finish(0);
+ critical_updates_done_msg_and_end();
}
reinit_local_tlpdb();
}