X-Git-Url: http://git.openwrt.org/?p=project%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_remove.c;fp=libopkg%2Fopkg_remove.c;h=c2abf8161e6b4cb81637ca862cc94aebaaf8a732;hp=96ca558393dbc6b66427ae9d416e593afbcd7f24;hb=9c44557a776da993c2ab80cfac4dbd8d59807d01;hpb=2edcfad1bb9a32f31199d5842aa087b4d30ec6f5

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.