8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux#30085
8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian Linux#30085alexeysemenyukoracle wants to merge 7 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into |
|
@alexeysemenyukoracle This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 44 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
|
@alexeysemenyukoracle The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
7509b6d to
944715b
Compare
…thread-safe; JPackageCommand: add fullVersion() and improve version(); don't validate dependencies of alien (non-native) packages; Fix "java.lang.AssertionError: Failed: Check [libc] package is in the list of required packages [/bin/sh, /bin/sh, /bin/sh, rpmlib(CompressedFileNames) <= 3.0.4-1, rpmlib(PayloadFilesHavePrefix) <= 4.0-1] of [simplepackagetest] package" error when bundling RPM package on Ubuntu
…n the number of format arguments doesn't match the number of format fields; add unit tests; ErrorTest: follow-up bugfix
… system where both RPM and DEB packaging is enabled.
… "error.unexpected-package-property"; Add missing single quote escape to the "error.unexpected-default-package-property.advice" message
83d0068 to
09fcc99
Compare
|
@sashamatveev PTAL |
Webrevs
|
…doesn't contain the "wrong Linux package architecture" error
09fcc99 to
ebc42da
Compare
|
@alexeysemenyukoracle Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
| error.unexpected-package-property=Expected value of "{0}" property is [{1}]. Actual value in output package is [{2}]. Looks like the value of "{0}" property is hardcoded in "{3}" file in the resource directory | ||
| error.unexpected-package-property.advice=Use [{0}] pattern string instead of hard coded value [{1}] of {2} property in custom "{3}" file | ||
| error.unexpected-default-package-property.advice=Don't explicitly set value of {0} property in custom "{1}" file | ||
| error.unexpected-default-package-property.advice=Don''t explicitly set value of "{0}" property in custom "{1}" file |
There was a problem hiding this comment.
Because the first quote escapes the second one. See https://docs.oracle.com/en/java/javase/25/docs/api/java.base/java/text/MessageFormat.html#quoting-rules-in-patterns-heading.
Without quoting, the format string is printed as Dont explicitly set value of {0} property in custom "{1}" file and format arguments are ignored. Note how Don't turns into Dont and formatting elements ({0}, and {1}) printed as is without being replaced by the arguments.
|
/integrate |
|
Going to push as commit c532dff.
Your commit was automatically rebased without conflicts. |
|
@alexeysemenyukoracle Pushed as commit c532dff. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Fix jpackage to use the correct arch for DEB bundles when running on RPM-based Linux, and vice versa.
The bug was in
jdk.jpackage.internal.LinuxBundlingEnvironmentclass.Additionally:
error.unexpected-default-package-property.advicel10n stringerror.unexpected-package-propertyl10n stringcannedFormattedStringAsPattern(); throw when the number of format arguments doesn't match the number of format fields; add unit tests; ErrorTest, InstallDirTest: follow-up bugfixesjava.lang.AssertionError: Failed: Check [libc] package is in the list of required packages [/bin/sh, /bin/sh, /bin/sh, rpmlib(CompressedFileNames) <= 3.0.4-1, rpmlib(PayloadFilesHavePrefix) <= 4.0-1] of [simplepackagetest] packageerror when bundling RPM package on Ubuntu; MakegetDefaultPackageArch()thread-safeProgress
Warning
8379348: jpackage will use wrong arch suffix for RPM bundle when running on Debian LinuxIssue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30085/head:pull/30085$ git checkout pull/30085Update a local copy of the PR:
$ git checkout pull/30085$ git pull https://git.openjdk.org/jdk.git pull/30085/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 30085View PR using the GUI difftool:
$ git pr show -t 30085Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30085.diff
Using Webrev
Link to Webrev Comment