summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-05-16 08:13:44 +0000
committerNorbert Preining <preining@logic.at>2008-05-16 08:13:44 +0000
commite9eba5739ddc72b9c08a3b17f949a3584c299277 (patch)
treedef36a532aaded6bb0950f0e7e55ab5cdf563050 /Master
parentc908fb2dc2f6934070c55f4b7f5c5fafdc6f1ab0 (diff)
tlmgr.pl, TLMedia.pm: use "install:" and "remove:" and make update messages
a bit clearer git-svn-id: svn://tug.org/texlive/trunk@8171 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl12
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm4
2 files changed, 9 insertions, 7 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 3b5e56975c2..cf3bacf9836 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -203,7 +203,7 @@ sub remove_package {
return;
}
}
- print "remove package $pkg\n";
+ print "remove: $pkg\n";
# we have to chdir to $localtlpdb->root
my $Master = $localtlpdb->root;
chdir ($Master) || die "chdir($Master) failed: $!";
@@ -289,7 +289,7 @@ sub action_remove {
# not Collections or Schemes
my %foo;
if ($opt_dry) {
- print "Removing $pkg\n";
+ 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;
@@ -307,7 +307,7 @@ sub action_remove {
if (defined($tlpdd)) {
if ($tlpdd->category !~ m/$MetaCategoriesRegexp/) {
if ($opt_dry) {
- print "Removing $d\n";
+ print "remove: $d\n";
} else {
merge_into(\%ret, &remove_package($d, $localtlpdb, $opt_force));
}
@@ -329,7 +329,7 @@ sub action_remove {
foreach my $pkg (@more_removal) {
if (!defined($already_removed{$pkg})) {
if ($opt_dry) {
- print "Removing $pkg\n";
+ print "remove: $pkg\n";
} else {
my %foo;
merge_into(\%foo, &remove_package($pkg, $localtlpdb, $opt_force));
@@ -604,8 +604,10 @@ sub action_update {
$opt_backupdir, "${pkg}.r" . $tlp->revision);
}
}
+ print "update: $pkg (first remove old, then install new)\n";
merge_into(\%ret, &remove_package($pkg, $localtlpdb, 1));
merge_into(\%ret, $tlmediasrc->install_package($pkg, $localtlpdb, $opt_nodepends, 1));
+ print "update: $pkg done\n";
}
} elsif ($rev > $mediarev) {
print "$pkg: revision in $location is less then local revision, not updating!\n";
@@ -631,7 +633,7 @@ sub action_install {
die($loadmediasrcerror . $location) unless defined($tlmediasrc);
foreach my $pkg (@ARGV) {
if ($opt_dry) {
- print "Installing $pkg\n";
+ print "install: $pkg\n";
} else {
# install the packages and run postinstall actions (that is the 1)
merge_into(\%ret, $tlmediasrc->install_package($pkg, $localtlpdb, $opt_nodepends, 1));
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index d1cdb14d627..67624c2ea39 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -106,9 +106,9 @@ sub install_package {
# get options about src/doc splitting from $totlpdb
my $opt_src = $totlpdb->option_srcfiles;
my $opt_doc = $totlpdb->option_docfiles;
- tllog($::LOG_NORMAL, "Installing: $pkg\n");
+ tllog($::LOG_NORMAL, "install: $pkg\n");
foreach my $h (@::install_packages_hook) {
- &$h("Installing: $package");
+ &$h("install: $package");
}
my $container;
my @installfiles;