summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-08 18:19:33 +0000
committerKarl Berry <karl@freefriends.org>2013-04-08 18:19:33 +0000
commitee55a9d2ec992f8487ee88e0d94587add07cf284 (patch)
treeea5b3ef6ccd4a4ca88d16e4c95bd5e02a0bd41fd
parentcc3895b03e0dc2bb0bdb506c557dbdc4714068ca (diff)
small message wordings
git-svn-id: svn://tug.org/texlive/trunk@29747 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl44
1 files changed, 22 insertions, 22 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 1514ad14c9d..de1c4c7b0c5 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -3135,7 +3135,7 @@ sub action_update {
}
}
if ($bad_file) {
- tlwarn("The file $k has disappeared from the critical" .
+ tlwarn("$prg: The file $k has disappeared from the critical" .
"package $pkg but is still present in @found_pkgs\n");
} else {
push @infra_files_to_be_removed, $k;
@@ -3178,14 +3178,14 @@ sub action_update {
# infra update and tlmgr restart on w32 is done by the updater batch script
if (win32() && !$opts{"list"} && @critical) {
- info("Preparing TeX Live infrastructure update...\n");
+ info("$prg: Preparing TeX Live infrastructure update...\n");
for my $f (@infra_files_to_be_removed) {
debug("file scheduled for removal $f\n");
}
my $ret = write_w32_updater($restart_tlmgr,
\@infra_files_to_be_removed, @critical);
if ($ret) {
- tlwarn ("Aborting infrastructure update.\n");
+ tlwarn ("$prg: Aborting infrastructure update.\n");
$restart_tlmgr = 0 if ($opts{"dry-run"});
}
}
@@ -3866,7 +3866,7 @@ sub action_option {
$localtlpdb->option($o) . "\n");
}
} else {
- tlwarn ("option $o not supported\n");
+ tlwarn ("$prg: option $o not supported\n");
}
}
} elsif ($what =~ m/^showall$/i) {
@@ -3900,13 +3900,13 @@ sub action_option {
if ($val =~ m/^ctan$/i) {
$val = "$TeXLive::TLConfig::TeXLiveURL";
}
- info("tlmgr: setting default package repository to $val\n");
+ info("$prg: setting default package repository to $val\n");
$localtlpdb->option($opt, $val);
} elsif ($what eq $TLPDBOptions{"backupdir"}->[2]) {
- info("tlmgr: setting option $what to $val.\n");
+ info("$prg: setting option $what to $val.\n");
if (! -d $val) {
- info("tlmgr: the directory $val does not exists, it has to be created\n");
- info("tlmgr: before backups can be done automatically.\n");
+ info("$prg: the directory $val does not exists, it has to be created\n");
+ info("$prg: before backups can be done automatically.\n");
}
$localtlpdb->option($opt, $val);
} elsif ($what eq $TLPDBOptions{"w32_multi_user"}->[2]) {
@@ -3919,7 +3919,7 @@ sub action_option {
} else {
if ($val) {
# non admin and tries to set to true, warn
- tlwarn("tlmgr: non-admin user cannot set $TLPDBOptions{'w32_multi_user'}->[2] option to true\n");
+ tlwarn("$prg: non-admin user cannot set $TLPDBOptions{'w32_multi_user'}->[2] option to true\n");
} else {
$do_it = 1;
}
@@ -3929,10 +3929,10 @@ sub action_option {
}
if ($do_it) {
if ($val) {
- info("tlmgr: setting option $what to 1.\n");
+ info("$prg: setting option $what to 1.\n");
$localtlpdb->option($opt, 1);
} else {
- info("tlmgr: setting option $what to 0.\n");
+ info("$prg: setting option $what to 0.\n");
$localtlpdb->option($opt, 0);
}
}
@@ -3940,17 +3940,17 @@ sub action_option {
# default case, switch for different types
if ($TLPDBOptions{$opt}->[0] eq "b") {
if ($val) {
- info("tlmgr: setting option $what to 1.\n");
+ info("$prg: setting option $what to 1.\n");
$localtlpdb->option($opt, 1);
} else {
- info("tlmgr: setting option $what to 0.\n");
+ info("$prg: setting option $what to 0.\n");
$localtlpdb->option($opt, 0);
}
} elsif ($TLPDBOptions{$opt}->[0] eq "p") {
- info("tlmgr: setting option $what to $val.\n");
+ info("$prg: setting option $what to $val.\n");
$localtlpdb->option($opt, $val);
} elsif ($TLPDBOptions{$opt}->[0] eq "u") {
- info("tlmgr: setting option $what to $val.\n");
+ info("$prg: setting option $what to $val.\n");
$localtlpdb->option($opt, $val);
} elsif ($TLPDBOptions{$opt}->[0] =~ m/^n(:((-)?\d+)?..((-)?\d+)?)?$/) {
my $isgood = 1;
@@ -3975,7 +3975,7 @@ sub action_option {
}
}
if ($isgood) {
- info("tlmgr: setting option $what to $n.\n");
+ info("$prg: setting option $what to $n.\n");
$localtlpdb->option($opt, $n);
}
} else {
@@ -4006,7 +4006,7 @@ sub action_option {
}
}
if (!$found) {
- tlwarn("tlmgr: option $what not supported!\n");
+ tlwarn("$prg: option $what not supported!\n");
}
}
return;
@@ -4771,7 +4771,7 @@ sub check_executes {
foreach my $k (keys %mapfn) {
my @bla = @{$mapfn{$k}};
if ($#bla > 0) {
- tlwarn ("map file $mf occurs multiple times (in pkg @bla)!\n");
+ tlwarn ("map file $mf occurs multiple times (in pkgs: @bla)!\n");
}
}
} else {
@@ -5116,7 +5116,7 @@ sub action_conf {
$cf->save;
}
} else {
- warn "tlmgr: unknown conf arg: $arg (try tlmgr or texmf)\n";
+ warn "$prg: unknown conf arg: $arg (try tlmgr or texmf)\n";
}
}
@@ -5296,7 +5296,7 @@ sub init_tlmedia
# this "location-url" line should not be changed since GUI programs
# depend on it:
print "location-url\t$locstr\n" if $::machinereadable;
- info("tlmgr: package repositories:\n");
+ info("$prg: package repositories:\n");
info("\tmain = " . $repos{'main'} . "\n");
for my $t (@tags) {
if ($t ne 'main') {
@@ -5340,7 +5340,7 @@ sub _init_tlmedia
# this "location-url" line should not be changed since GUI programs
# depend on it:
print "location-url\t$location\n" if $::machinereadable;
- info("tlmgr: package repository $location\n");
+ info("$prg: package repository $location\n");
return 1;
}
@@ -5520,7 +5520,7 @@ sub finish
my ($ret) = @_;
if ($ret > 0) {
- print "tlmgr: exiting unsuccessfully (status $ret).\n";
+ print "$prg: exiting unsuccessfully (status $ret).\n";
}
if ($opts{"pause"}) {