Author: cziegeler Date: Wed Oct 19 15:26:41 2016 New Revision: 1765664 URL: http://svn.apache.org/viewvc?rev=1765664&view=rev Log: SLING-5014 : Installer blacklist, to avoid reinstalling older bundles. Apply patch from Dominik Süß.
Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java?rev=1765664&r1=1765663&r2=1765664&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java Wed Oct 19 15:26:41 2016 @@ -180,7 +180,8 @@ public class BundleTaskCreator boolean sameVersion = toActivate.getVersion().equals(candidate.getVersion()); if (!sameVersion) { if (bundleBlacklist.isBlacklisted(symbolicName, candidate.getVersion())) { - // blaklisted candidates should be uninstalled to no longer be taken into account anymore + logger.info("Uninstalling blacklisted bundle {} found at {}", symbolicName, candidate.getURL()); + // blacklisted candidates should be uninstalled to no longer be taken into account anymore ((RegisteredResourceImpl)candidate).setState(ResourceState.UNINSTALL); } else { second = candidate; @@ -223,6 +224,7 @@ public class BundleTaskCreator } else { final Version newVersion = new Version((String) toActivate.getAttribute(Constants.BUNDLE_VERSION)); if (bundleBlacklist.isBlacklisted(symbolicName, newVersion)) { + logger.info("Ignoring blacklisted bundle {} found at {}", symbolicName, toActivate.getURL()); result = new ChangeStateTask(resourceList, ResourceState.IGNORED); } else {