texlive[44146] Master/texmf-dist/scripts/texlive/tlmgr.pl:
commits+karl at tug.org
commits+karl at tug.org
Tue May 2 00:53:26 CEST 2017
Revision: 44146
http://tug.org/svn/texlive?view=revision&revision=44146
Author: karl
Date: 2017-05-02 00:53:26 +0200 (Tue, 02 May 2017)
Log Message:
-----------
(action_conf): use tlwarn() instead of undefined warning();
makee "tlmgr conf texmf auxtrees" equivalent to show.
Modified Paths:
--------------
trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2017-05-01 22:41:15 UTC (rev 44145)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2017-05-01 22:53:26 UTC (rev 44146)
@@ -5558,7 +5558,7 @@
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 @@
}
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 @@
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 @@
$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 @@
$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 @@
}
} 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");
More information about the tex-live-commits
mailing list