summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-07-31 12:31:05 +0000
committerNorbert Preining <preining@logic.at>2009-07-31 12:31:05 +0000
commitb4ecb53892e78b49037159474555c16a884f71fe (patch)
treea512ad06c90c451bca894c8b0a2d4ccf0c484096 /Master
parentf13772c6e08c3def76dec2e2af7e3457ea9ec896 (diff)
update the tlmgr usermode patch after TT's last changes
git-svn-id: svn://tug.org/texlive/trunk@14507 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/etc/dev.usermode-tlmgr.patch72
1 files changed, 27 insertions, 45 deletions
diff --git a/Master/tlpkg/etc/dev.usermode-tlmgr.patch b/Master/tlpkg/etc/dev.usermode-tlmgr.patch
index a961d916cb5..590c826a6d3 100644
--- a/Master/tlpkg/etc/dev.usermode-tlmgr.patch
+++ b/Master/tlpkg/etc/dev.usermode-tlmgr.patch
@@ -1,6 +1,6 @@
Index: tlpkg/TeXLive/TLConfig.pm
===================================================================
---- tlpkg/TeXLive/TLConfig.pm (revision 14488)
+--- tlpkg/TeXLive/TLConfig.pm (revision 14499)
+++ tlpkg/TeXLive/TLConfig.pm (working copy)
@@ -162,11 +162,13 @@
@@ -20,7 +20,7 @@ Index: tlpkg/TeXLive/TLConfig.pm
Index: tlpkg/TeXLive/TLPOBJ.pm
===================================================================
---- tlpkg/TeXLive/TLPOBJ.pm (revision 14488)
+--- tlpkg/TeXLive/TLPOBJ.pm (revision 14499)
+++ tlpkg/TeXLive/TLPOBJ.pm (working copy)
@@ -448,6 +448,21 @@
sub cancel_reloc_prefix {
@@ -46,7 +46,7 @@ Index: tlpkg/TeXLive/TLPOBJ.pm
my @runfiles = $self->runfiles;
Index: tlpkg/TeXLive/TLMedia.pm
===================================================================
---- tlpkg/TeXLive/TLMedia.pm (revision 14488)
+--- tlpkg/TeXLive/TLMedia.pm (revision 14499)
+++ tlpkg/TeXLive/TLMedia.pm (working copy)
@@ -48,6 +48,8 @@
}
@@ -109,7 +109,7 @@ Index: tlpkg/TeXLive/TLMedia.pm
#
Index: tlpkg/TeXLive/TLUtils.pm
===================================================================
---- tlpkg/TeXLive/TLUtils.pm (revision 14488)
+--- tlpkg/TeXLive/TLUtils.pm (revision 14499)
+++ tlpkg/TeXLive/TLUtils.pm (working copy)
@@ -1187,7 +1187,7 @@
# if a package is relocatable we have to cancel the reloc prefix
@@ -122,7 +122,7 @@ Index: tlpkg/TeXLive/TLUtils.pm
# we have to write out the tlpobj file since it is contained in the
Index: texmf/scripts/texlive/tlmgr.pl
===================================================================
---- texmf/scripts/texlive/tlmgr.pl (revision 14493)
+--- texmf/scripts/texlive/tlmgr.pl (revision 14502)
+++ texmf/scripts/texlive/tlmgr.pl (working copy)
@@ -125,6 +125,8 @@
"machine-readable" => 1,
@@ -313,37 +313,19 @@ Index: texmf/scripts/texlive/tlmgr.pl
my $what = shift @ARGV;
if (!defined($what) || ($what !~ m/^(add|remove)$/i)) {
tlwarn("action path needs one argument, either add or remove\n");
-@@ -1380,17 +1414,19 @@
- }
- }
- if ($other_updates_asked_for && !$opts{"self"}) {
-- if (check_for_critical_updates($localtlpdb, $tlmediatlpdb)) {
-- if ($opts{"force"}) {
-- tlwarn("$0: Continuing due to --force.\n");
-- } elsif ($opts{"list"} || $opts{"self"}) {
-- # do not warn here
-- } else {
-- if ($::gui_mode) {
-- # return here and don't do any updates
-- return;
-+ if (!$opts{"usermode"}) {
-+ if (check_for_critical_updates($localtlpdb, $tlmediatlpdb)) {
-+ if ($opts{"force"}) {
-+ tlwarn("$0: Continuing due to --force.\n");
-+ } elsif ($opts{"list"} || $opts{"self"}) {
-+ # do not warn here
- } else {
-- die "$0: Exiting, please read above warning.\n";
-+ if ($::gui_mode) {
-+ # return here and don't do any updates
-+ return;
-+ } else {
-+ die "$0: Exiting, please read above warning.\n";
-+ }
- }
- }
- }
-@@ -1808,7 +1844,8 @@
+@@ -1355,7 +1389,10 @@
+
+ # check for updates to tlmgr and die unless either --force or --list or --self
+ # is given
+- my @critical = check_for_critical_updates($localtlpdb, $tlmediatlpdb);
++ my @critical;
++ if (!$opts{"usermode"}) {
++ @critical = check_for_critical_updates($localtlpdb, $tlmediatlpdb);
++ }
+ my $dry_run_cont = $opts{"dry-run"} && ($opts{"dry-run"} < 0);
+ if ( !$dry_run_cont && !$opts{"self"} && @critical) {
+ critical_updates_warning();
+@@ -1787,7 +1824,8 @@
if ($opts{"backup"} && !$opts{"dry-run"}) {
$tlp->make_container("xz", $root,
@@ -353,12 +335,12 @@ Index: texmf/scripts/texlive/tlmgr.pl
$unwind_package =
"$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.xz";
-@@ -1988,16 +2025,18 @@
- $opts{"no-depends"} = 1 if $opts{"no-depends-at-all"};
+@@ -1990,16 +2028,18 @@
init_tlmedia();
-- # check for updates to tlmgr itself, and die unless --force is given
+ # check for updates to tlmgr itself, and die unless --force is given
- if (check_for_critical_updates( $localtlpdb, $tlmediatlpdb)) {
+- critical_updates_warning();
- if ($opts{"force"}) {
- tlwarn("Continuing due to --force\n");
- } else {
@@ -366,8 +348,8 @@ Index: texmf/scripts/texlive/tlmgr.pl
- # return here and don't do any updates
- return;
+ if (!$opts{"usermode"}) {
-+ # check for updates to tlmgr itself, and die unless --force is given
+ if (check_for_critical_updates( $localtlpdb, $tlmediatlpdb)) {
++ critical_updates_warning();
+ if ($opts{"force"}) {
+ tlwarn("Continuing due to --force\n");
} else {
@@ -381,7 +363,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
}
}
}
-@@ -2034,6 +2073,15 @@
+@@ -2036,6 +2076,15 @@
}
}
foreach my $pkg (@inst_packs, @inst_colls, @inst_schemes) {
@@ -397,7 +379,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
my $re = "";
if (defined($localtlpdb->get_package($pkg))) {
if ($opts{"reinstall"}) {
-@@ -2239,6 +2287,10 @@
+@@ -2241,6 +2290,10 @@
if ($^O=~/^MSWin(32|64)$/i) {
warn("action `arch' not supported on Windows\n");
}
@@ -408,7 +390,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
if ($opts{"gui"}) {
action_gui("arch");
}
-@@ -2320,6 +2372,10 @@
+@@ -2322,6 +2375,10 @@
# GENERATE
#
sub action_generate {
@@ -419,7 +401,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
my $dest = defined($opts{"dest"}) ? $opts{"dest"} : "";
my $localconf = defined($opts{"localcfg"}) ? $opts{"localcfg"} : "";
my $what = shift @ARGV;
-@@ -3119,6 +3175,34 @@
+@@ -3121,6 +3178,34 @@
#
@@ -454,7 +436,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
# action conf
# tries to mimick texconfig conf but probably will add some more things
#
-@@ -3182,10 +3266,10 @@
+@@ -3184,10 +3269,10 @@
# stuff changed via the GUI
return if defined $localtlmedia;
return if defined $localtlpdb;