You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/01/27 08:36:20 UTC
svn commit: r1780517 -
/sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java
Author: kwin
Date: Fri Jan 27 08:36:20 2017
New Revision: 1780517
URL: http://svn.apache.org/viewvc?rev=1780517&view=rev
Log:
SLING-6484 for SNAPSHOT versions really reinstall every time a new package has been uploaded
Modified:
sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java
Modified: sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java?rev=1780517&r1=1780516&r2=1780517&view=diff
==============================================================================
--- sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java (original)
+++ sling/trunk/installer/factories/packages/src/main/java/org/apache/sling/installer/factory/packages/impl/PackageTransformer.java Fri Jan 27 08:36:20 2017
@@ -215,12 +215,16 @@ public class PackageTransformer implemen
return;
}
- // check if package was installed in the meantime
- if (pkg.isInstalled()) {
- String message = MessageFormat.format("Package {0} was installed externally. Marking as installed.", pkgId);
- logger.info(message);
- this.setFinishedState(ResourceState.INSTALLED, null, message);
- return;
+ // if this is a SNAPSHOT version we always trigger a reinstall
+ // (this workaround can be removed once https://issues.apache.org/jira/browse/JCRVLT-155 is implemented)
+ if (!pkgId.getVersionString().endsWith("-SNAPSHOT")) {
+ // check if package was installed previously by some other means (or even by a previous run of the installer)
+ if (pkg.isInstalled()) {
+ String message = MessageFormat.format("Package {0} was installed externally. Marking as installed.", pkgId);
+ logger.info(message);
+ this.setFinishedState(ResourceState.INSTALLED, null, message);
+ return;
+ }
}
// check if dependencies are installed