diff options
author | Norbert Preining <preining@logic.at> | 2015-04-24 02:45:40 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2015-04-24 02:45:40 +0000 |
commit | f59f89c16d6872ac954db6d222e9da9a6a6edd38 (patch) | |
tree | 3537472e6a9bdf340222d5ba790a855e8f64ce73 | |
parent | 0883494e1dddf3c04372a60a3cb3fdd0916ecaa0 (diff) |
return code from generate, make generate fmtutil deprecated
git-svn-id: svn://tug.org/texlive/trunk@37030 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index 00ed88622ad..c31818d8a9e 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -4409,7 +4409,7 @@ sub action_platform { sub action_generate { if ($opts{"usermode"}) { tlwarn("action `generate' not supported in usermode!\n"); - exit 1; + return $F_ERROR; } my $what = shift @ARGV; init_local_db(); @@ -4491,6 +4491,12 @@ sub action_generate { } } elsif ($what =~ m/^fmtutil$/i) { + tlwarn("$prg: generate fmtutil is no longer needed or supported.\n"); + tlwarn("$prg: Please read the documentation of the `fmtutil' program.\n"); + tlwarn("$prg: Goodbye.\n"); + return $F_ERROR; + + } elsif ($what =~ m/^_fmtutil$/i) { my $dest = $opts{"dest"} || "$TEXMFDIST/web2c/fmtutil.cnf"; debug("$prg: writing new fmtutil.cnf to $dest\n"); TeXLive::TLUtils::create_fmtutil($localtlpdb, $dest); @@ -4506,7 +4512,7 @@ sub action_generate { tlwarn("$prg: generate updmap is no longer needed or supported.\n"); tlwarn("$prg: Please read the documentation of the `updmap' program.\n"); tlwarn("$prg: Goodbye.\n"); - exit(1); + return $F_ERROR; } elsif ($what =~ m/^_updmap$/i) { my $dest = $opts{"dest"} || "$TEXMFDIST/web2c/updmap.cfg"; @@ -4521,10 +4527,11 @@ sub action_generate { } } else { - die "$prg: Unknown option for generate: $what; try --help if you need it.\n"; + tlwarn("$prg: Unknown option for generate: $what; try --help if you need it.\n"); + return $F_ERROR; } - return; + return $F_OK; } |