sync

git-svn-id: svn://tug.org/texlive/trunk@37725 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 13 insertions, 24 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index 0cb6aad1739..9585cfb9d9f 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: fmtutil.pl 37563 2015-06-16 13:21:24Z preining $
+# $Id: fmtutil.pl 37583 2015-06-17 05:51:36Z preining $
 # fmtutil - utility to maintain format files.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
@@ -25,11 +25,11 @@ BEGIN {
 }
 
 
-my $svnid = '$Id: fmtutil.pl 37563 2015-06-16 13:21:24Z preining $';
-my $lastchdate = '$Date: 2015-06-16 15:21:24 +0200 (Tue, 16 Jun 2015) $';
+my $svnid = '$Id: fmtutil.pl 37583 2015-06-17 05:51:36Z preining $';
+my $lastchdate = '$Date: 2015-06-17 07:51:36 +0200 (Wed, 17 Jun 2015) $';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 37563 $';
+my $svnrev = '$Revision: 37583 $';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
@@ -716,9 +716,12 @@ sub callback_enable_disable_format {
     if ($alldata->{'merged'}{$fmt}) {
       my @engs = keys %{$alldata->{'merged'}{$fmt}};
       if (($#engs > 0) || ($#engs == -1)) {
-        print_warning("More engines given for format $fmt.\n");
-        print_warning("Possible engines: @engs\n");
-        print_warning("Please select one by passing in $fmt/ENGINE\n");
+        print_warning("Selected format $fmt not uniquely defined,\n");
+        print_warning("possible format/engines combinations:\n");
+        for my $e (@engs) {
+          print_warning("  $fmt/$e (currently " . $alldata->{'merged'}{$fmt}{$e}{'status'} . ")\n");
+        }
+        print_warning("Please select one by fully specifying $fmt/ENGINE\n");
         print_warning("No changes done.\n");
         return 0;
       } else {
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 76746e25f05..220791f6194 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 37523 2015-06-14 13:37:20Z preining $
+# $Id: tlmgr.pl 37643 2015-06-23 04:33:46Z preining $
 #
 # Copyright 2008-2015 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
 
-my $svnrev = '$Revision: 37523 $';
-my $datrev = '$Date: 2015-06-14 15:37:20 +0200 (Sun, 14 Jun 2015) $';
+my $svnrev = '$Revision: 37643 $';
+my $datrev = '$Date: 2015-06-23 06:33:46 +0200 (Tue, 23 Jun 2015) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -125,20 +125,6 @@ our $FLAG_REINSTALL = "I";
 our $common_fmtutil_args = 
   "--no-error-if-no-engine=$TeXLive::TLConfig::PartialEngineSupport";
 
-# return flags for error handling
-#
-# all fine
-our $F_OK = 0;
-#
-# some warnings, but we still try to run post actions
-our $F_WARNING = 1;
-#
-# error, terminating
-our $F_ERROR = 2;
-#
-# all fine, but no need to run post actions
-our $F_NOPOSTACTION = 4;
-
 # option variables
 $::gui_mode = 0;
 $::machinereadable = 0;