diff options
| author | Hongxu Jia | 2021-09-07 22:42:45 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich | 2022-01-26 08:16:26 +0000 |
| commit | 9c44557a776da993c2ab80cfac4dbd8d59807d01 (patch) | |
| tree | 9b327d0a188ebe9dcf6dc3e7f283c5abc67bba5e | |
| parent | 2edcfad1bb9a32f31199d5842aa087b4d30ec6f5 (diff) | |
| download | opkg-lede-9c44557a776da993c2ab80cfac4dbd8d59807d01.tar.gz | |
opkg_remove: avoid remove pkg repeatly with option --force-removal-of-dependent-packages
While remove pkg with '--force-removal-of-dependent-packages',
pkg may be added to pkgs remove list multiple times, add status
check to make sure pkg only be removed once.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
(Cherry picked from https://git.yoctoproject.org/cgit/cgit.cgi/opkg/commit/?id=e8996180833aa35d101fbeadec3d787ce0bbda5c)
(Fixes https://dev.archive.openwrt.org/ticket/18320 and openwrt/packages CI)
| -rw-r--r-- | libopkg/opkg_remove.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c index 96ca558..c2abf81 100644 --- a/libopkg/opkg_remove.c +++ b/libopkg/opkg_remove.c @@ -249,6 +249,14 @@ int opkg_remove_pkg(pkg_t * pkg, int from_upgrade) if ((parent_pkg = pkg->parent) == NULL) return 0; + /* While remove pkg with '--force-removal-of-dependent-packages', + pkg may be added to remove list multiple times, add status + check to make sure pkg only be removed once. */ + if (conf->force_removal_of_dependent_packages && + pkg->state_flag & SF_FILELIST_CHANGED && + pkg->state_status == SS_NOT_INSTALLED) + return 0; + /* only attempt to remove dependent installed packages if * force_depends is not specified or the package is being * replaced. |