summaryrefslogtreecommitdiffstats
path: root/item_updater.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'item_updater.cpp')
-rw-r--r--item_updater.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/item_updater.cpp b/item_updater.cpp
index 6dd7a52..173ee29 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -324,6 +324,7 @@ void ItemUpdater::erase(std::string entryId)
}
else
{
+ removeAssociations(ita->second->path);
this->activations.erase(entryId);
}
ItemUpdater::resetUbootEnvVars();
@@ -520,14 +521,11 @@ void ItemUpdater::createFunctionalAssociation(const std::string& path)
associations(assocs);
}
-void ItemUpdater::removeActiveAssociation(const std::string& path)
+void ItemUpdater::removeAssociations(const std::string& path)
{
for (auto iter = assocs.begin(); iter != assocs.end();)
{
- // Since there could be multiple associations to the same path,
- // only remove ones that have an active forward association.
- if ((std::get<0>(*iter)).compare(ACTIVE_FWD_ASSOCIATION) == 0 &&
- (std::get<2>(*iter)).compare(path) == 0)
+ if ((std::get<2>(*iter)).compare(path) == 0)
{
iter = assocs.erase(iter);
associations(assocs);
OpenPOWER on IntegriCloud