texlive[45794] Master: tlmgr paper: use tlmgr in msgs, report file,
commits+preining at tug.org
commits+preining at tug.org
Tue Nov 14 09:45:16 CET 2017
Revision: 45794
http://tug.org/svn/texlive?view=revision&revision=45794
Author: preining
Date: 2017-11-14 09:45:15 +0100 (Tue, 14 Nov 2017)
Log Message:
-----------
tlmgr paper: use tlmgr in msgs, report file, break when --json is unsupported
Modified Paths:
--------------
trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
trunk/Master/tlpkg/TeXLive/TLPaper.pm
Modified: trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2017-11-14 06:51:51 UTC (rev 45793)
+++ trunk/Master/texmf-dist/scripts/texlive/tlmgr.pl 2017-11-14 08:45:15 UTC (rev 45794)
@@ -110,6 +110,8 @@
#
# set up $prg for warning messages
$prg = TeXLive::TLUtils::basename($0);
+# for usage in various Perl modules
+$::prg = $prg;
binmode(STDOUT, ":utf8");
binmode(STDERR, ":utf8");
@@ -1242,6 +1244,10 @@
} else { # tlmgr paper {a4|letter} => do it.
return ($F_ERROR) if !check_on_writable();
+ if ($opts{'json'}) {
+ tlwarn("$prg: option --json not supported with other arguments\n");
+ return ($F_ERROR);
+ }
my $ret = $F_OK;
for my $prog (sort keys %TeXLive::TLPaper::paper) {
my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'};
@@ -1254,6 +1260,10 @@
}
} else { # program-specific paper
+ if ($opts{'json'}) {
+ tlwarn("$prg: option --json not supported with other arguments\n");
+ return ($F_ERROR);
+ }
my $prog = $action; # first argument is the program to change
my $pkg = $TeXLive::TLPaper::paper{$prog}{'pkg'};
if (!$pkg) {
Modified: trunk/Master/tlpkg/TeXLive/TLPaper.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLPaper.pm 2017-11-14 06:51:51 UTC (rev 45793)
+++ trunk/Master/tlpkg/TeXLive/TLPaper.pm 2017-11-14 08:45:15 UTC (rev 45794)
@@ -28,6 +28,8 @@
@EXPORT = @EXPORT_OK;
}
+my $prg = ($::prg ? $::prg : TeXLive::TLUtils::basename($0));
+
=pod
=head1 NAME
@@ -232,7 +234,7 @@
my $sub = $paper{$prog}{'sub'};
return(&$sub($texmfsysconfig, @args));
} else {
- tlwarn("$0: unknown paper program $prog ($texmfsysconfig, at args)\n");
+ tlwarn("$prg: unknown paper program $prog ($texmfsysconfig, at args)\n");
return($F_ERROR);
}
return ($F_OK); # not reached
@@ -274,7 +276,7 @@
}
}
- debug("$0: found no paper file for $progname (from $cmd)\n") if ! $ret;
+ debug("$prg: found no paper file for $progname (from $cmd)\n") if ! $ret;
return $ret;
}
@@ -341,7 +343,7 @@
return($F_ERROR) unless $inp;
- open(FOO, "<$inp") || die "$0: open($inp) failed: $!";
+ open(FOO, "<$inp") || die "$prg: open($inp) failed: $!";
my @lines = <FOO>;
close(FOO);
@@ -455,23 +457,23 @@
$lines[$#lines] = $addlines;
}
}
- info("$0: setting paper size for pdftex to $newpaper.\n");
+ info("$prg: setting paper size for pdftex to $newpaper: $outfile\n");
mkdirhier(dirname($outfile));
# if we create the outfile we have to call mktexlsr
TeXLive::TLUtils::announce_execute_actions("files-changed")
unless (-r $outfile);
if (!open(TMP, ">$outfile")) {
- tlwarn("$0: Cannot write to $outfile: $!\n");
+ tlwarn("$prg: Cannot write to $outfile: $!\n");
tlwarn("Not setting paper size for pdftex.\n");
return($F_ERROR);
}
for (@lines) { print TMP; }
- close(TMP) || warn "$0: close(>$outfile) failed: $!";
+ close(TMP) || warn "$prg: close(>$outfile) failed: $!";
TeXLive::TLUtils::announce_execute_actions("regenerate-formats");
# TODO should we return the value of announce_execute action?
return($F_OK);
} else {
- tlwarn("$0: Not a valid paper size for pdftex: $newpaper\n");
+ tlwarn("$prg: Not a valid paper size for pdftex: $newpaper\n");
return($F_WARNING);
}
}
@@ -520,7 +522,7 @@
return($F_ERROR) unless $inp;
- open(FOO, "<$inp") || die "$0: open($inp) failed: $!";
+ open(FOO, "<$inp") || die "$prg: open($inp) failed: $!";
my @lines = <FOO>;
close(FOO);
@@ -587,20 +589,20 @@
}
push @newlines, $lines[$idx];
}
- info("$0: setting paper size for dvips to $newpaper.\n");
+ info("$prg: setting paper size for dvips to $newpaper: $outfile\n");
mkdirhier(dirname($outfile));
# if we create the outfile we have to call mktexlsr
TeXLive::TLUtils::announce_execute_actions("files-changed")
unless (-r $outfile);
if (!open(TMP, ">$outfile")) {
- tlwarn("$0: Cannot write to $outfile: $!\n");
+ tlwarn("$prg: Cannot write to $outfile: $!\n");
tlwarn("Not setting paper size for dvips.\n");
return ($F_ERROR);
}
for (@newlines) { print TMP; }
- close(TMP) || warn "$0: close(>$outfile) failed: $!";
+ close(TMP) || warn "$prg: close(>$outfile) failed: $!";
} else {
- tlwarn("$0: Not a valid paper size for dvips: $newpaper\n");
+ tlwarn("$prg: Not a valid paper size for dvips: $newpaper\n");
return($F_WARNING);
}
}
@@ -684,7 +686,7 @@
return($F_ERROR) unless $inp;
- open(FOO, "<$inp") || die "$0: open($inp) failed: $!";
+ open(FOO, "<$inp") || die "$prg: open($inp) failed: $!";
my @lines = <FOO>;
close(FOO);
@@ -762,23 +764,23 @@
$lines[$#lines] = $addlines;
}
}
- info("$0: setting paper size for context to $newpaper.\n");
+ info("$prg: setting paper size for context to $newpaper: $outfile\n");
mkdirhier(dirname($outfile));
# if we create the outfile we have to call mktexlsr
TeXLive::TLUtils::announce_execute_actions("files-changed")
unless (-r $outfile);
if (!open(TMP, ">$outfile")) {
- tlwarn("$0: Cannot write to $outfile: $!\n");
+ tlwarn("$prg: Cannot write to $outfile: $!\n");
tlwarn("Not setting paper size for context.\n");
return($F_ERROR);
}
for (@lines) { print TMP; }
- close(TMP) || warn "$0: close(>$outfile) failed: $!";
+ close(TMP) || warn "$prg: close(>$outfile) failed: $!";
TeXLive::TLUtils::announce_execute_actions("regenerate-formats");
# TODO should we return the value of announce_execute action?
return($F_OK);
} else {
- tlwarn("$0: Not a valid paper size for context: $newpaper\n");
+ tlwarn("$prg: Not a valid paper size for context: $newpaper\n");
return($F_WARNING);
}
}
@@ -931,23 +933,23 @@
if (!$foundcfg) {
push @newlines, &$bl($defaultline, $newpaper);
}
- info("$0: setting paper size for $prog to $newpaper.\n");
+ info("$prg: setting paper size for $prog to $newpaper: $outfile\n");
mkdirhier(dirname($outp));
# if we create the outfile we have to call mktexlsr
TeXLive::TLUtils::announce_execute_actions("files-changed")
unless (-r $outp);
if (!open(TMP, ">$outp")) {
- tlwarn("$0: Cannot write to $outp: $!\n");
+ tlwarn("$prg: Cannot write to $outp: $!\n");
tlwarn("Not setting paper size for $prog.\n");
return ($F_ERROR);
}
for (@newlines) { print TMP; }
- close(TMP) || warn "$0: close(>$outp) failed: $!";
+ close(TMP) || warn "$prg: close(>$outp) failed: $!";
TeXLive::TLUtils::announce_execute_actions("regenerate-formats")
if ($prog eq "context");
return($F_OK);
} else {
- tlwarn("$0: Not a valid paper size for $prog: $newpaper\n");
+ tlwarn("$prg: Not a valid paper size for $prog: $newpaper\n");
return($F_WARNING);
}
}
More information about the tex-live-commits
mailing list