--- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java 2019-03-12 12:15:23.385870300 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java 2019-03-12 12:15:21.654248100 -0400 @@ -579,9 +579,13 @@ if (Log.isVerbose()) { throw e; } else { - Log.error(e.getMessage()); + String msg1 = e.getMessage(); + Log.error(msg1); if (e.getCause() != null && e.getCause() != e) { - Log.error(e.getCause().getMessage()); + String msg2 = e.getCause().getMessage(); + if (!msg1.contains(msg2)) { + Log.error(msg2); + } } return false; } @@ -671,6 +675,7 @@ throw new PackagerException("ERR_InvalidInstallerType", deployParams.getTargetFormat()); } + PackagerException pe = null; for (jdk.jpackage.internal.Bundler bundler : bundlers) { Map localParams = new HashMap<>(params); try { @@ -686,25 +691,33 @@ } bundleCreated = true; // at least one bundle was created } - } catch (UnsupportedPlatformException e) { - throw new PackagerException(e, - "MSG_BundlerPlatformException", - bundler.getName()); + Log.verbose(MessageFormat.format( + I18N.getString("message.bundle-created"), + bundler.getName())); + } catch (UnsupportedPlatformException upe) { + Log.debug(upe); + if (pe == null) { + pe = new PackagerException(upe, + "MSG_BundlerPlatformException", bundler.getName()); + } } catch (ConfigException e) { Log.debug(e); - if (e.getAdvice() != null) { - throw new PackagerException(e, + if (pe == null) { + pe = (e.getAdvice() != null) ? + new PackagerException(e, "MSG_BundlerConfigException", - bundler.getName(), e.getMessage(), e.getAdvice()); - } else { - throw new PackagerException(e, + bundler.getName(), e.getMessage(), e.getAdvice()) : + new PackagerException(e, "MSG_BundlerConfigExceptionNoAdvice", bundler.getName(), e.getMessage()); } } catch (RuntimeException re) { Log.debug(re); - throw new PackagerException(re, "MSG_BundlerRuntimeException", - bundler.getName(), re.toString()); + if (pe == null) { + pe = new PackagerException(re, + "MSG_BundlerRuntimeException", + bundler.getName(), re.toString()); + } } finally { if (userProvidedBuildRoot) { Log.verbose(MessageFormat.format( @@ -713,7 +726,10 @@ } } } - + if (pe != null) { + // throw packager exception only after trying all bundlers + throw pe; + } return bundleCreated; } --- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties 2019-03-12 12:15:32.246783900 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties 2019-03-12 12:15:30.608762900 -0400 @@ -84,7 +84,7 @@ \ Vendor of the application\n\ \ --verbose\n\ \ Enables verbose output\n\ -\ --version -v\n\ +\ --version\n\ \ Print the product version to the output stream and exit\n\ \n\ \Options for creating the runtime image:\n\ --- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties 2019-03-12 12:15:40.187285700 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_ja.properties 2019-03-12 12:15:38.564864900 -0400 @@ -84,7 +84,7 @@ \ Vendor of the application\n\ \ --verbose\n\ \ Enables verbose output\n\ -\ --version -v\n\ +\ --version\n\ \ Print the product version to the output stream and exit\n\ \n\ \Options for creating the runtime image:\n\ --- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties 2019-03-12 12:15:48.066812300 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources_zh_CN.properties 2019-03-12 12:15:46.459651800 -0400 @@ -84,7 +84,7 @@ \ Vendor of the application\n\ \ --verbose\n\ \ Enables verbose output\n\ -\ --version -v\n\ +\ --version\n\ \ Print the product version to the output stream and exit\n\ \n\ \Options for creating the runtime image:\n\ --- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties 2019-03-12 12:15:55.993390300 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties 2019-03-12 12:15:54.386229800 -0400 @@ -42,6 +42,7 @@ message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}\: {1} does not exists message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists message.debug-working-directory=Kept working directory for debug\: {0} +message.bundle-created=Succeeded in building {0} bundle error.cannot-create-output-dir=Output directory {0} cannot be created. error.cannot-write-to-output-dir=Output directory {0} is not writable. --- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties 2019-03-12 12:16:03.858554600 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_ja.properties 2019-03-12 12:16:02.235790600 -0400 @@ -42,6 +42,7 @@ message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}\: {1} does not exists message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists message.debug-working-directory=Kept working directory for debug\: {0} +message.bundle-created=Succeeded in building {0} bundle error.cannot-create-output-dir=Output directory {0} cannot be created. error.cannot-write-to-output-dir=Output directory {0} is not writable. --- old/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties 2019-03-12 12:16:11.644701100 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources_zh_CN.properties 2019-03-12 12:16:10.068747600 -0400 @@ -42,6 +42,7 @@ message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}\: {1} does not exists message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists message.debug-working-directory=Kept working directory for debug\: {0} +message.bundle-created=Succeeded in building {0} bundle error.cannot-create-output-dir=Output directory {0} cannot be created. error.cannot-write-to-output-dir=Output directory {0} is not writable. --- old/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java 2019-03-12 12:16:19.727314100 -0400 +++ new/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java 2019-03-12 12:16:18.151360600 -0400 @@ -119,7 +119,7 @@ private static boolean hasVersion(String[] args) { for (String a : args) { - if ("--version".equals(a) || "-v".equals(a)) { + if ("--version".equals(a)) { return true; } }