summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-01 22:53:26 +0000
committerKarl Berry <karl@freefriends.org>2017-05-01 22:53:26 +0000
commit40bd61e86286fa38d393157effa7cd00dd83689a (patch)
treea29b691778ebdc9c143582a368e8afd7e3863176 /Master
parent368d0a467659b479b8824de776c0969537a4fb1a (diff)
(action_conf): use tlwarn() instead of undefined warning();
makee "tlmgr conf texmf auxtrees" equivalent to show. git-svn-id: svn://tug.org/texlive/trunk@44146 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/tlmgr.pl21
1 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index cc08146ab6a..7343a91fb61 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5558,7 +5558,7 @@ sub action_conf {
if ($arg eq "texmf") {
my $tmfa = 'TEXMFAUXTREES';
my $tv = $cf->value($tmfa);
- if ($val eq "show") {
+ if (!$val || $val eq "show") {
if (defined($tv)) {
$tv =~ s/^\s*{//;
$tv =~ s/}\s*$//;
@@ -5570,7 +5570,7 @@ sub action_conf {
}
return($F_OK);
} else {
- print "No auxiliary texmf trees defined.\n";
+ print "$prg: no auxiliary texmf trees defined.\n";
return($F_OK);
}
} elsif ($val eq "add") {
@@ -5584,7 +5584,7 @@ sub action_conf {
my $already = 0;
for my $f (@foo) {
if ($f eq $str) {
- print "Already registered auxtree: $str\n";
+ tlwarn("$prg: already registered auxtree: $str\n");
return ($F_WARNING);
} else {
push @new, $f;
@@ -5596,7 +5596,7 @@ sub action_conf {
$cf->value($tmfa, '{' . $str . ',}');
}
} else {
- warning("argument missing for auxtrees add\n");
+ tlwarn("$prg: missing argument for auxtrees add\n");
return($F_ERROR);
}
} elsif ($val eq "remove") {
@@ -5622,23 +5622,24 @@ sub action_conf {
$cf->delete_key($tmfa);
}
} else {
- print ("Not defined as auxiliary texmf tree: $str\n");
+ tlwarn("$prg: not defined as auxiliary texmf tree: $str\n");
return($F_WARNING);
}
} else {
- print "No auxiliary texmf trees defined, nothing removed\n";
+ tlwarn("$prg: no auxiliary texmf trees defined, "
+ . "so nothing removed\n");
return($F_WARNING);
}
} else {
- warning("argument missing for auxtrees remove\n");
+ tlwarn("$prg: missing argument for auxtrees remove\n");
return($F_ERROR);
}
} else {
- warning("unknown operation on auxtrees: $val\n");
+ tlwarn("$prg: unknown auxtrees operation: $val\n");
return($F_ERROR);
}
} else {
- warning("auxtrees not suitable for $arg\n");
+ tlwarn("$prg: auxtrees not suitable for $arg\n");
return($F_ERROR);
}
} elsif (!defined($val)) {
@@ -5670,7 +5671,7 @@ sub action_conf {
}
} else {
if (defined($opts{'delete'})) {
- warning("$arg --delete and value for key $key given, don't know what to do!\n");
+ tlwarn("$arg --delete and value for key $key given, don't know what to do!\n");
$ret = $F_ERROR;
} else {
info("setting $arg $key to $val (in $fn)\n");