Skip to content

8301856: Generated .spec file for RPM installers uninstalls desktop launcher on update #16800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Nov 23, 2023

Fix uninstallation scripts in Linux installers to take action on desktop files only if these desktop files are not owned by another package. This prevents xdg-mime uninstall, xdg-desktop-menu uninstall commands from execution in case of upgrades.

Borrowed helper shell script function from "launchers as services" for the fix. Now on Linux there is shared code between "launchers as services" and "desktop integration" subsystems - "common_utils.sh". Added ServiceAndDesktopTest.java to test how they align.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8301856: Generated .spec file for RPM installers uninstalls desktop launcher on update (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16800/head:pull/16800
$ git checkout pull/16800

Update a local copy of the PR:
$ git checkout pull/16800
$ git pull https://git.openjdk.org/jdk.git pull/16800/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16800

View PR using the GUI difftool:
$ git pr show -t 16800

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16800.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 23, 2023

👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 23, 2023
@openjdk
Copy link

openjdk bot commented Nov 23, 2023

@alexeysemenyukoracle The following label will be automatically applied to this pull request:

  • core-libs

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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Nov 23, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 23, 2023

Webrevs

@alexeysemenyukoracle
Copy link
Member Author

@sashamatveev please review

Copy link
Member

@sashamatveev sashamatveev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@openjdk
Copy link

openjdk bot commented Nov 27, 2023

@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:

8301856: Generated .spec file for RPM installers uninstalls desktop launcher on update

Reviewed-by: almatvee

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 109 new commits pushed to the master branch:

  • 726f854: 8320706: RuntimePackageTest.testUsrInstallDir test fails on Linux
  • 1bb250c: 8261837: SIGSEGV in ciVirtualCallTypeData::translate_from
  • 5f7f2c4: 8320249: tools/jpackage/share/AddLauncherTest.java#id1 fails intermittently on Windows in verifyDescription
  • 6871a2f: 8320803: Update SourceVersion.RELEASE_22 description for language changes
  • 82967f4: 8310159: Bulk copy with Unsafe::arrayCopy is slower compared to memcpy
  • f0a12c5: 8320763: Fix spacing arround assignment in spec.gmk.in
  • 12e983a: 8194743: Compiler implementation for Statements before super()
  • 5e24aaf: 8320001: javac crashes while adding type annotations to the return type of a constructor
  • f9e9131: 8319703: Serial: Remove generationSpec
  • a006d7e: 8294549: configure script should detect unsupported path
  • ... and 99 more: https://git.openjdk.org/jdk/compare/9902d2eb177072c108933056cba544cc5a34bb54...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 27, 2023
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 27, 2023

Going to push as commit 7848ed7.
Since your change was applied there have been 109 commits pushed to the master branch:

  • 726f854: 8320706: RuntimePackageTest.testUsrInstallDir test fails on Linux
  • 1bb250c: 8261837: SIGSEGV in ciVirtualCallTypeData::translate_from
  • 5f7f2c4: 8320249: tools/jpackage/share/AddLauncherTest.java#id1 fails intermittently on Windows in verifyDescription
  • 6871a2f: 8320803: Update SourceVersion.RELEASE_22 description for language changes
  • 82967f4: 8310159: Bulk copy with Unsafe::arrayCopy is slower compared to memcpy
  • f0a12c5: 8320763: Fix spacing arround assignment in spec.gmk.in
  • 12e983a: 8194743: Compiler implementation for Statements before super()
  • 5e24aaf: 8320001: javac crashes while adding type annotations to the return type of a constructor
  • f9e9131: 8319703: Serial: Remove generationSpec
  • a006d7e: 8294549: configure script should detect unsupported path
  • ... and 99 more: https://git.openjdk.org/jdk/compare/9902d2eb177072c108933056cba544cc5a34bb54...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 27, 2023
@openjdk openjdk bot closed this Nov 27, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 27, 2023
@openjdk
Copy link

openjdk bot commented Nov 27, 2023

@alexeysemenyukoracle Pushed as commit 7848ed7.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@alexeysemenyukoracle alexeysemenyukoracle deleted the JDK-8301856 branch November 9, 2024 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants