summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-09-27 22:18:57 +0000
committerNorbert Preining <preining@logic.at>2008-09-27 22:18:57 +0000
commit1e39b2112410b7128ef9d53130f766c409aeb920 (patch)
tree18b68b3d698d7734804b64d06a8b54c92e4f0510
parent0cdc57f63c5542d006f469156432c76ba1b63026 (diff)
removal messages are now more standard and are also always used with info()
git-svn-id: svn://tug.org/texlive/trunk@10752 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl17
1 files changed, 6 insertions, 11 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 7ff9bb51b90..dcbcc0f9c16 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -371,13 +371,12 @@ sub action_remove {
# for collections we also remove all dependencies which are
# not Collections or Schemes
my %foo;
+ info ("remove $pkg\n");
if ($opt_dry) {
- print "remove: $pkg\n";
# we need to set $foo to something positive otherwise
# the rest will not be run in dry_run mode
$foo{'mktexlsr'} = 1;
} else {
- info ("remove $pkg\n");
merge_into(\%foo, &remove_package($pkg, $localtlpdb, $opt_force));
}
if (keys %foo) {
@@ -390,10 +389,8 @@ sub action_remove {
my $tlpdd = $localtlpdb->get_package($d);
if (defined($tlpdd)) {
if ($tlpdd->category !~ m/$MetaCategoriesRegexp/) {
- if ($opt_dry) {
- print "remove: $d\n";
- } else {
- info ("remove $d\n");
+ info ("remove $d\n");
+ if (!$opt_dry) {
merge_into(\%ret, &remove_package($d, $localtlpdb, $opt_force));
}
$already_removed{$d} = 1;
@@ -413,11 +410,9 @@ sub action_remove {
}
foreach my $pkg (@more_removal) {
if (!defined($already_removed{$pkg})) {
- if ($opt_dry) {
- print "remove: $pkg\n";
- } else {
+ info ("remove $pkg\n");
+ if (!$opt_dry) {
my %foo;
- info ("remove $pkg\n");
merge_into(\%foo, &remove_package($pkg, $localtlpdb, $opt_force));
if (keys %foo) {
# removal was successful
@@ -432,7 +427,7 @@ sub action_remove {
return;
} else {
$localtlpdb->save;
- my @foo = sort ( keys %already_removed);
+ my @foo = sort ( keys %already_removed );
print "Actually removed packages: @foo\n";
return(\%ret);
}