From c735b9241ab79b03666e3793b15c35d86be0719f Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 8 Aug 2009 10:20:26 +0000 Subject: update usermode patch git-svn-id: svn://tug.org/texlive/trunk@14582 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/etc/dev.usermode-tlmgr.patch | 96 +++++++++++++------------------ 1 file changed, 40 insertions(+), 56 deletions(-) (limited to 'Master/tlpkg/etc') diff --git a/Master/tlpkg/etc/dev.usermode-tlmgr.patch b/Master/tlpkg/etc/dev.usermode-tlmgr.patch index 590c826a6d3..bfe0c81c8ee 100644 --- a/Master/tlpkg/etc/dev.usermode-tlmgr.patch +++ b/Master/tlpkg/etc/dev.usermode-tlmgr.patch @@ -1,28 +1,22 @@ Index: tlpkg/TeXLive/TLConfig.pm =================================================================== ---- tlpkg/TeXLive/TLConfig.pm (revision 14499) +--- tlpkg/TeXLive/TLConfig.pm (revision 14577) +++ tlpkg/TeXLive/TLConfig.pm (working copy) -@@ -162,11 +162,13 @@ +@@ -183,7 +183,8 @@ - our %TLPDBSettingType = ( - "platform" => "s", -- "available_architectures" => "l" -+ "available_architectures" => "l", -+ "usertree" => "b" + our %TLPDBSettings = ( + "platform" => [ "s", "Main platform for this computer" ], +- "available_architectures" => [ "l", "All available/installed architectures" ] ++ "available_architectures" => [ "l", "All available/installed architectures" ], ++ "usertree" => [ "b", "This tree acts as user tree" ] ); - our %TLPDBSettingDesc = ( - "platform" => "Main platform for this computer", -- "available_architectures" => "All available/installed architectures" -+ "available_architectures" => "All available/installed architectures", -+ "usertree" => "This tree acts as user tree" - ); - + our $WindowsMainMenuName = "TeX Live $ReleaseYear"; Index: tlpkg/TeXLive/TLPOBJ.pm =================================================================== ---- tlpkg/TeXLive/TLPOBJ.pm (revision 14499) +--- tlpkg/TeXLive/TLPOBJ.pm (revision 14577) +++ tlpkg/TeXLive/TLPOBJ.pm (working copy) -@@ -448,6 +448,21 @@ +@@ -459,6 +459,21 @@ sub cancel_reloc_prefix { my $self = shift; my @docfiles = $self->docfiles; @@ -46,9 +40,9 @@ Index: tlpkg/TeXLive/TLPOBJ.pm my @runfiles = $self->runfiles; Index: tlpkg/TeXLive/TLMedia.pm =================================================================== ---- tlpkg/TeXLive/TLMedia.pm (revision 14499) +--- tlpkg/TeXLive/TLMedia.pm (revision 14577) +++ tlpkg/TeXLive/TLMedia.pm (working copy) -@@ -48,6 +48,8 @@ +@@ -60,6 +60,8 @@ } if (-d "$location/texmf/web2c") { $media = 'DVD'; @@ -57,7 +51,7 @@ Index: tlpkg/TeXLive/TLMedia.pm } elsif (-d "$location/$Archive") { $media = 'CD'; } else { -@@ -235,8 +237,12 @@ +@@ -247,8 +249,12 @@ } # if a package is relocatable we have to cancel the reloc prefix # before we save it to the local tlpdb @@ -72,7 +66,7 @@ Index: tlpkg/TeXLive/TLMedia.pm } # we have to write out the tlpobj file since it is contained in the # archives (.tar.xz) but at DVD install time we don't have them -@@ -305,7 +311,11 @@ +@@ -317,7 +323,11 @@ } elsif ($what =~ m,\.tar(\.xz)?$,) { my $type = defined($1) ? "xz" : "tar"; @@ -85,7 +79,7 @@ Index: tlpkg/TeXLive/TLMedia.pm # this is the case when we install from CD or the NET, or a backup # -@@ -388,6 +398,7 @@ +@@ -400,6 +410,7 @@ my ($self, $pkg, $nopostinstall) = @_; my $localtlpdb = $self->tlpdb; my $tlp = $localtlpdb->get_package($pkg); @@ -93,7 +87,7 @@ Index: tlpkg/TeXLive/TLMedia.pm if (!defined($tlp)) { tlwarn ("$pkg: package not present, cannot remove\n"); } else { -@@ -413,9 +424,12 @@ +@@ -425,9 +436,12 @@ # in user mode we just remove the prefix, in normal mode we # replace it with texmf-dist # since we don't have user mode @@ -109,9 +103,9 @@ Index: tlpkg/TeXLive/TLMedia.pm # Index: tlpkg/TeXLive/TLUtils.pm =================================================================== ---- tlpkg/TeXLive/TLUtils.pm (revision 14499) +--- tlpkg/TeXLive/TLUtils.pm (revision 14577) +++ tlpkg/TeXLive/TLUtils.pm (working copy) -@@ -1187,7 +1187,7 @@ +@@ -1198,7 +1198,7 @@ # if a package is relocatable we have to cancel the reloc prefix # before we save it to the local tlpdb if ($tlpobj->relocated) { @@ -122,9 +116,9 @@ 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 14502) +--- texmf/scripts/texlive/tlmgr.pl (revision 14581) +++ texmf/scripts/texlive/tlmgr.pl (working copy) -@@ -125,6 +125,8 @@ +@@ -122,6 +122,8 @@ "machine-readable" => 1, "package-logfiles" => "=s", "pause" => 1, @@ -133,7 +127,7 @@ Index: texmf/scripts/texlive/tlmgr.pl "version" => 1, "help|h|?" => 1); -@@ -287,13 +289,30 @@ +@@ -285,13 +287,30 @@ pod2usage(-msg => $msg, -exitstatus => 1, -verbose => 1, @noperldoc); } @@ -165,7 +159,7 @@ Index: texmf/scripts/texlive/tlmgr.pl # # Try to open the packagelog file, but do NOT die when that does not work if (!open(PACKAGELOG, ">>$packagelogfile")) { -@@ -416,6 +435,9 @@ +@@ -427,6 +446,9 @@ } elsif ($action =~ m/^show$/i) { action_show(); finish(0); @@ -175,7 +169,7 @@ Index: texmf/scripts/texlive/tlmgr.pl } elsif ($action =~ m/^remove$/i) { action_remove(); } elsif ($action =~ /^paper$/) { -@@ -469,6 +491,8 @@ +@@ -480,6 +502,8 @@ # sub handle_execute_actions { @@ -184,7 +178,7 @@ Index: texmf/scripts/texlive/tlmgr.pl my $errors = 0; if ($::files_changed) { -@@ -501,14 +525,14 @@ +@@ -512,14 +536,14 @@ } } for my $m (keys %do_disable) { @@ -202,7 +196,7 @@ Index: texmf/scripts/texlive/tlmgr.pl } -@@ -550,7 +574,7 @@ +@@ -561,7 +585,7 @@ if ($opt_fmt && !$::regenerate_all_formats) { for my $f (keys %do_enable) { log ("(re)creating format dump $f\n"); @@ -211,7 +205,7 @@ Index: texmf/scripts/texlive/tlmgr.pl $done_formats{$f} = 1; } -@@ -565,7 +589,7 @@ +@@ -576,7 +600,7 @@ for my $e (@upen) { if ($def{'engine'} eq $e) { log ("updating format $def{'name'} (engine $e updated)\n"); @@ -220,7 +214,7 @@ Index: texmf/scripts/texlive/tlmgr.pl $done_formats{$def{'name'}} = 1; } } -@@ -607,7 +631,7 @@ +@@ -618,7 +642,7 @@ $lang = "$TEXMFSYSVAR/tex/generic/config/$lang"; } if ($localtlpdb->option("create_formats") && !$::regenerate_all_formats) { @@ -229,7 +223,7 @@ Index: texmf/scripts/texlive/tlmgr.pl } } } -@@ -616,7 +640,7 @@ +@@ -627,7 +651,7 @@ # if ($::regenerate_all_formats) { info("Regenerating all formats, this may take some time ..."); @@ -238,7 +232,7 @@ Index: texmf/scripts/texlive/tlmgr.pl info("done\n"); $::regenerate_all_formats = 0; } -@@ -788,8 +812,13 @@ +@@ -799,8 +823,13 @@ action_gui("config") if $opts{"gui"}; init_local_db(); @@ -254,7 +248,7 @@ Index: texmf/scripts/texlive/tlmgr.pl my $action = shift @ARGV; if ($action =~ m/^paper$/i) { # generic paper -@@ -801,14 +830,14 @@ +@@ -812,14 +841,14 @@ "as in: tlmgr pdftex paper --list\n"); } elsif (!defined($newpaper)) { # tlmgr paper => show all current sizes. @@ -271,7 +265,7 @@ Index: texmf/scripts/texlive/tlmgr.pl } } else { # program-specific paper -@@ -822,7 +851,7 @@ +@@ -833,7 +862,7 @@ # the do_paper progs check for the argument --list, so if given # restore it to the cmd line. unshift(@ARGV, "--list") if $opts{"list"}; @@ -280,7 +274,7 @@ Index: texmf/scripts/texlive/tlmgr.pl } } -@@ -863,13 +892,14 @@ +@@ -874,13 +903,14 @@ # include arbitrary package in the list of collections, but # only collectons: @colls = grep {m;^collection-;} @colls; @@ -302,7 +296,7 @@ Index: texmf/scripts/texlive/tlmgr.pl if ($opts{"list"}) { if ($tlp->category eq "Collection" || $tlp->category eq "Scheme") { # in the case of collections of schemes we list the deps -@@ -933,6 +963,10 @@ +@@ -944,6 +974,10 @@ # SYMLINKS # sub action_path { @@ -313,7 +307,7 @@ 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"); -@@ -1355,7 +1389,10 @@ +@@ -1424,7 +1458,10 @@ # check for updates to tlmgr and die unless either --force or --list or --self # is given @@ -325,17 +319,7 @@ Index: texmf/scripts/texlive/tlmgr.pl 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, -- $opts{"backupdir"}, "${pkg}.r" . $tlp->revision); -+ $opts{"backupdir"}, "${pkg}.r" . $tlp->revision, -+ $tlp->relocated); - $unwind_package = - "$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.xz"; - -@@ -1990,16 +2028,18 @@ +@@ -2060,16 +2097,18 @@ init_tlmedia(); # check for updates to tlmgr itself, and die unless --force is given @@ -363,7 +347,7 @@ Index: texmf/scripts/texlive/tlmgr.pl } } } -@@ -2036,6 +2076,15 @@ +@@ -2106,6 +2145,15 @@ } } foreach my $pkg (@inst_packs, @inst_colls, @inst_schemes) { @@ -379,7 +363,7 @@ Index: texmf/scripts/texlive/tlmgr.pl my $re = ""; if (defined($localtlpdb->get_package($pkg))) { if ($opts{"reinstall"}) { -@@ -2241,6 +2290,10 @@ +@@ -2321,6 +2369,10 @@ if ($^O=~/^MSWin(32|64)$/i) { warn("action `arch' not supported on Windows\n"); } @@ -390,7 +374,7 @@ Index: texmf/scripts/texlive/tlmgr.pl if ($opts{"gui"}) { action_gui("arch"); } -@@ -2322,6 +2375,10 @@ +@@ -2402,6 +2454,10 @@ # GENERATE # sub action_generate { @@ -401,7 +385,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; -@@ -3121,6 +3178,34 @@ +@@ -3209,6 +3265,34 @@ # @@ -436,7 +420,7 @@ Index: texmf/scripts/texlive/tlmgr.pl # action conf # tries to mimick texconfig conf but probably will add some more things # -@@ -3184,10 +3269,10 @@ +@@ -3272,10 +3356,10 @@ # stuff changed via the GUI return if defined $localtlmedia; return if defined $localtlpdb; -- cgit v1.2.3