summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-09-18 16:13:46 +0000
committerNorbert Preining <preining@logic.at>2008-09-18 16:13:46 +0000
commit4439cf5adc13f7e740c0c05d62e428896055119f (patch)
treeeda3a50bba55faf4bb107e0912b3cb8c43e6e74e
parentb7efa4c070bda01ca83e825059d4ff0cb0f4f410 (diff)
less stupid messages at removal time
git-svn-id: svn://tug.org/texlive/trunk@10637 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/etc/safer-update.diff32
1 files changed, 12 insertions, 20 deletions
diff --git a/Master/tlpkg/etc/safer-update.diff b/Master/tlpkg/etc/safer-update.diff
index a58eae3bf7c..eff61010331 100644
--- a/Master/tlpkg/etc/safer-update.diff
+++ b/Master/tlpkg/etc/safer-update.diff
@@ -296,23 +296,15 @@ Index: texmf/scripts/texlive/tlmgr.pl
# we have to chdir to $localtlpdb->root
my $Master = $localtlpdb->root;
chdir ($Master) || die "chdir($Master) failed: $!";
-@@ -294,6 +293,7 @@
- foreach my $entry (@removals) {
- rmdir $entry;
- }
-+ info ("remove $pkg\n");
- $localtlpdb->remove_package($pkg);
- merge_into(\%ret, $tlp->make_return_hash_from_executes("disable"));
- $ret{'mktexlsr'} = 1;
-@@ -302,6 +302,7 @@
+@@ -302,6 +301,7 @@
if ($d eq "$pkg.ARCH") {
foreach my $a ($localtlpdb->available_architectures) {
if (defined($localtlpdb->get_package("$pkg.$a"))) {
-+ info ("remove $pkg.$a\n");
++ debug ("remove $pkg.$a\n");
merge_into(\%ret,
&remove_package("$pkg.$a", $localtlpdb, $force));
}
-@@ -372,6 +373,7 @@
+@@ -372,6 +372,7 @@
# the rest will not be run in dry_run mode
$foo{'mktexlsr'} = 1;
} else {
@@ -320,7 +312,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
merge_into(\%foo, &remove_package($pkg, $localtlpdb, $opt_force));
}
if (keys %foo) {
-@@ -387,6 +389,7 @@
+@@ -387,6 +388,7 @@
if ($opt_dry) {
print "remove: $d\n";
} else {
@@ -328,7 +320,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
merge_into(\%ret, &remove_package($d, $localtlpdb, $opt_force));
}
$already_removed{$d} = 1;
-@@ -410,6 +413,7 @@
+@@ -410,6 +412,7 @@
print "remove: $pkg\n";
} else {
my %foo;
@@ -336,7 +328,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
merge_into(\%foo, &remove_package($pkg, $localtlpdb, $opt_force));
if (keys %foo) {
# removal was successful
-@@ -677,6 +681,8 @@
+@@ -677,6 +680,8 @@
printf STDERR "$0: cannot find package $pkg\n";
next;
}
@@ -345,7 +337,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
my $rev = $tlp->revision;
my $mediatlp = $mediatlpdb->get_package($pkg);
if (!defined($mediatlp)) {
-@@ -702,6 +708,7 @@
+@@ -702,6 +707,7 @@
my $tlp = $localtlpdb->get_package($pkg);
$tlp->make_container("lzma", $localtlpdb->root,
$opt_backupdir, "${pkg}.r" . $tlp->revision);
@@ -353,7 +345,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
}
}
if (win32() && ($pkg =~ m/$WinSpecialUpdatePackagesRegexp/)) {
-@@ -757,10 +764,51 @@
+@@ -757,10 +763,51 @@
}
}
} else {
@@ -408,7 +400,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
}
}
} elsif ($rev > $mediarev) {
-@@ -813,6 +861,7 @@
+@@ -813,6 +860,7 @@
print "install: $pkg\n";
} else {
# install the packages and run postinstall actions (that is the 0)
@@ -416,7 +408,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
merge_into(\%ret, $tlmediasrc->install_package($pkg, $localtlpdb, $opt_nodepends, 0));
}
}
-@@ -976,6 +1025,7 @@
+@@ -976,6 +1024,7 @@
if ($opt_dry) {
print "Installing $pkg.$a\n";
} else {
@@ -424,7 +416,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
merge_into(\%ret, $tlmediasrc->install_package("$pkg.$a", $localtlpdb, 0, 0));
}
}
-@@ -984,8 +1034,11 @@
+@@ -984,8 +1033,11 @@
}
if (TeXLive::TLUtils::member('win32', @todoarchs)) {
# install the necessary win32 stuff
@@ -436,7 +428,7 @@ Index: texmf/scripts/texlive/tlmgr.pl
merge_into (\%ret, $tlmediasrc->install_package("bin-tlpsv.win32", $localtlpdb, 1, 0));
}
# update the option_archs list of installed archs
-@@ -1072,6 +1125,9 @@
+@@ -1072,6 +1124,9 @@
if (!defined($location)) {
die("No installation source found, nor in the texlive.tlpdb nor on the cmd line.\nPlease specify one!");
}