lttng: Fix lttng.control upgrade from 3.0.0 to 3.x.0

Change-Id: Ie2f419e7bb461c4dfb73f5ea01d68ced261b765f
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/32269
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Hudson CI

diff --git a/org.eclipse.linuxtools.lttng2.control/p2.inf b/org.eclipse.linuxtools.lttng2.control/p2.inf
index 24f4f2bc672c6608a8fa459d407c9be624ee96cd..23d394a8da4447fbaffde4a5fcaba42254d155e7 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.control/p2.inf
+++ b/org.eclipse.linuxtools.lttng2.control/p2.inf
@@ -2,7 +2,4 @@ instructions.configure=\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
 
-update.id = org.eclipse.linuxtools.lttng2.feature.group
-update.range = 0.0.0
-update.severity = 0
-update.description = Transition to the new feature name lttng2.control
+update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.feature.group' || pc.name == 'org.eclipse.linuxtools.lttng2.control.feature.group'))

diff --git a/org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf b/org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf
index 6fa47c1509796d4895a18a4ce60ad671dcc475b9..2ba3d5afca771ac54a5f03377cf568c2c151b3ef 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf
+++ b/org.eclipse.linuxtools.lttng2.control/sourceTemplateFeature/p2.inf
@@ -2,7 +2,4 @@ instructions.configure=\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:0,name:Linux Tools,enabled:false); \
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/linuxtools/updates-nightly,type:1,name:Linux Tools,enabled:false); 
 
-update.id = org.eclipse.linuxtools.lttng2.source.feature.group
-update.range = 0.0.0
-update.severity = 0
-update.description = Transition to the new feature name lttng2.control
+update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.linuxtools.lttng2.source.feature.group' || pc.name == 'org.eclipse.linuxtools.lttng2.control.source.feature.group'))