From: Hongxu Jia Date: Tue, 7 Sep 2021 22:42:45 +0000 (-0400) Subject: opkg_remove: avoid remove pkg repeatly with option --force-removal-of-dependent-packages X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9c44557a776da993c2ab80cfac4dbd8d59807d01;p=project%2Fopkg-lede.git 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 Signed-off-by: Paul Barker (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) --- 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.