|
 |
dc388e |
From decc6ec5f3c5ce87fa50c2cfe932d66e89496810 Mon Sep 17 00:00:00 2001
|
|
|
dc388e |
From: Roland Grunberg <rgrunber@redhat.com>
|
|
|
dc388e |
Date: Wed, 3 Aug 2016 14:57:10 -0400
|
|
|
dc388e |
Subject: [PATCH] p2 Droplets should be recognized as runnable repositories.
|
|
|
dc388e |
|
|
|
dc388e |
Normally, a runnable repository is identified by the 'p2.runnable'
|
|
|
dc388e |
property contained within the artifact repository (artifact.xml).
|
|
|
dc388e |
However, in Fedora we ship p2 Droplets without this file so we need a
|
|
|
dc388e |
way to let methods like getRunnableRepositories in
|
|
|
dc388e |
o.e.equinox.internal.p2.touchpoint.eclipse.Util know that p2 Droplets
|
|
|
dc388e |
are runnable repositories.
|
|
|
dc388e |
|
|
|
dc388e |
Change-Id: I0ad0a7557f998b4d032466f89e6cc76036d1fb38
|
|
|
dc388e |
---
|
|
|
dc388e |
.../ExtensionLocationArtifactRepository.java | 16 ++++++++++++++++
|
|
|
dc388e |
1 file changed, 16 insertions(+)
|
|
|
dc388e |
|
|
|
dc388e |
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
|
|
dc388e |
index 342e33e..425a166 100644
|
|
|
dc388e |
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
|
|
dc388e |
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
|
|
|
dc388e |
@@ -284,6 +284,22 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository
|
|
|
dc388e |
return artifactRepository.getProperties();
|
|
|
dc388e |
}
|
|
|
dc388e |
|
|
|
dc388e |
+ public String getProperty(String key) {
|
|
|
dc388e |
+ if (IArtifactRepository.PROP_RUNNABLE.equals(key)) {
|
|
|
dc388e |
+ String candidate = getLocation().getPath();
|
|
|
dc388e |
+ String fragments = System.getProperty("p2.fragments");
|
|
|
dc388e |
+ if (fragments != null) {
|
|
|
dc388e |
+ String[] rootPaths = fragments.split(",");
|
|
|
dc388e |
+ for (String root : rootPaths) {
|
|
|
dc388e |
+ if (candidate.startsWith(root)) {
|
|
|
dc388e |
+ return Boolean.TRUE.toString();
|
|
|
dc388e |
+ }
|
|
|
dc388e |
+ }
|
|
|
dc388e |
+ }
|
|
|
dc388e |
+ }
|
|
|
dc388e |
+ return super.getProperty(key);
|
|
|
dc388e |
+ }
|
|
|
dc388e |
+
|
|
|
dc388e |
@Override
|
|
|
dc388e |
public String setProperty(String key, String value, IProgressMonitor monitor) {
|
|
|
dc388e |
try {
|
|
|
dc388e |
--
|
|
|
dc388e |
2.7.4
|
|
|
dc388e |
|