-
Notifications
You must be signed in to change notification settings - Fork 740
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a hack in pkg to skip running predeinstall for javavmwrapper-2.5
During upgrades/reinstall javavmwrapper 2.5 pre deinstall script deletes the pkg temporary files preventing to finish the upgrade. A fixed version of javavmwrapper will be made soon, this hack will remain in the ports tree and not in pkg(8) itself. This hack is made to not bother users is only affecting upgrade/reinstall phase not proper deinstall PR: 210313
- Loading branch information
Showing
2 changed files
with
34 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
diff --git libpkg/pkg_add.c libpkg/pkg_add.c | ||
index 87fb248..778336c 100644 | ||
--- libpkg/pkg_add.c | ||
+++ libpkg/pkg_add.c | ||
@@ -859,14 +859,20 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag | ||
* Execute pre deinstall scripts | ||
*/ | ||
if ((flags & PKG_ADD_NOSCRIPT) == 0) { | ||
- if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS) | ||
- ret = pkg_script_run(old, PKG_SCRIPT_PRE_UPGRADE); | ||
- else | ||
- ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL); | ||
- if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) | ||
- return (ret); | ||
- else | ||
- ret = EPKG_OK; | ||
+ bool buggydeinstall = false; | ||
+ if (strcmp(old->name, "javavmwrapper") == 0 && | ||
+ strcmp(old->version, "2.5") == 0) | ||
+ buggydeinstall = true; | ||
+ if (!buggydeinstall) { | ||
+ if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS) | ||
+ ret = pkg_script_run(old, PKG_SCRIPT_PRE_UPGRADE); | ||
+ else | ||
+ ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL); | ||
+ if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) | ||
+ return (ret); | ||
+ else | ||
+ ret = EPKG_OK; | ||
+ } | ||
} | ||
|
||
/* Now remove files that no longer exist in the new package */ |