From 7fe45a369eac949694fa25632920efd3b107e813 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 7 Aug 2009 18:08:54 +0000 Subject: - fix __MASTER__ in tlmgr recreate-tlpdb - rename tlmgr update options: --no-remove -> --no-auto-remove --no-forcibly-removed -> --reinstall-forcibly-removed - add documentation and explanations to tlmgr for these options and the different states of packages git-svn-id: svn://tug.org/texlive/trunk@14572 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/scripts/texlive/tlmgr.pl | 67 +++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 22 deletions(-) (limited to 'Master/texmf') diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 17ffb660f10..315cbbc3209 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -145,9 +145,9 @@ sub main { "all" => 1, "self" => 1, "list" => 1, - "no-remove" => 1, + "no-auto-remove" => 1, "no-auto-install" => 1, - "no-forcibly-removed" => 1, + "reinstall-forcibly-removed" => 1, "force" => 1, "backupdir" => "=s", "backup" => 1, @@ -1556,7 +1556,7 @@ sub action_update { next if $removals{$p}; my $tlp = $localtlpdb->get_package($p); if (!defined($tlp)) { - if ($opts{"no-forcibly-removed"}) { + if ($opts{"reinstall-forcibly-removed"}) { $newpkgs{$p} = 1; } else { $forcermpkgs{$p} = 1; @@ -1694,7 +1694,7 @@ sub action_update { # remove the packages that have disappeared: # we add that only to the list of total packages do be worked on # when --all is given, because we remove packages only on --all - if (!$opts{"no-remove"} && $opts{"all"}) { + if (!$opts{"no-auto-remove"} && $opts{"all"}) { my @foo = keys %removals; $totalnr += $#foo + 1; } @@ -1722,8 +1722,8 @@ sub action_update { for (@addlines) { print; } for my $p (keys %removals) { - if ($opts{"no-remove"}) { - info("not removing $p due to -no-remove (removed on server)\n"); + if ($opts{"no-auto-remove"}) { + info("not removing $p due to -no-auto-remove (removed on server)\n"); } else { &ddebug("removing package $p\n"); my $pkg = $localtlmedia->tlpdb->get_package($p); @@ -1744,7 +1744,7 @@ sub action_update { $currnr++; } else { # new we are sure that: - # - $opts{"no-remove"} is *not* set + # - $opts{"no-auto-remove"} is *not* set # - $opts{"list"} is *not* set # we have to check in addition that # - $opts{"dry-run"} is not set @@ -2626,6 +2626,10 @@ sub action_recreate_tlpdb { $tlpdb->add_tlpobj($inst); # reset the options to default values $tlpdb->add_default_options(); + # check for location == _MASTER_ + if ($tlpdb->option("location") eq "__MASTER__") { + $tlpdb->option("location", $TeXLive::TLConfig::TeXLiveURL); + } # add the other stuff in $Master/tlpkg/tlpobj/*.tlpobj # we can ignore *.{source,doc}.tlpobj because they are already # included in the *.tlpobj parent one at install time @@ -3560,8 +3564,11 @@ tlmgr itself, disaster recovery when it's broken, and test versions. =head1 OPTIONS -The following options to C have to be given I you specify -the main action to perform. In all cases, C<-->I