diff options
| author | Mickael Istria | 2016-10-13 17:19:10 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2017-10-18 04:03:52 +0000 |
| commit | 0162f13f797c9adc240332a9c3975cccb3491a03 (patch) | |
| tree | 242a8d54f7147119d944446b920a3bfa9eaf79f2 | |
| parent | 86583602bc6475defa8c68f52455ed3d43b803bb (diff) | |
| download | rt.equinox.p2-0162f13f797c9adc240332a9c3975cccb3491a03.tar.gz rt.equinox.p2-0162f13f797c9adc240332a9c3975cccb3491a03.tar.xz rt.equinox.p2-0162f13f797c9adc240332a9c3975cccb3491a03.zip | |
Bug 505808 - Read platform filters in category.xmlS4_8_0_M3aS4_8_0_M3I20171102-2000I20171101-2000I20171031-2000I20171030-2000I20171030-0400I20171029-2000I20171028-1500I20171027-2340I20171027-2000I20171025-2000I20171025-0800I20171024-2000I20171024-0800I20171023-2000I20171023-0800I20171022-2000I20171022-0800I20171021-1500I20171020-2000I20171019-2000I20171018-2000
Change-Id: I3efae8b14bde7a1cbd148b430e7a7fcbf659cf3e
Signed-off-by: Mickael Istria <mistria@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryParser.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryParser.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryParser.java index 77c10ad12..61aedd5f3 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryParser.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryParser.java @@ -7,7 +7,8 @@ * * Contributors: * IBM Corporation - initial API and implementation - * Red Hat Inc. - 383795 (bundle element), 406902 (nested categories) + * Red Hat Inc. - 383795 (bundle element), 406902 (nested categories), + * 505808 (platform filters in category.xml) *******************************************************************************/ package org.eclipse.equinox.internal.p2.updatesite; @@ -760,6 +761,9 @@ public class CategoryParser extends DefaultHandler { // identifier and version String id = attributes.getValue("id"); //$NON-NLS-1$ String ver = attributes.getValue("version"); //$NON-NLS-1$ + String os = attributes.getValue("os"); //$NON-NLS-1$ + String ws = attributes.getValue("ws"); //$NON-NLS-1$ + String arch = attributes.getValue("arch"); //$NON-NLS-1$ boolean noId = (id == null || id.trim().equals("")); //$NON-NLS-1$ @@ -769,6 +773,9 @@ public class CategoryParser extends DefaultHandler { feature.setFeatureIdentifier(id); feature.setFeatureVersion(ver); + feature.setOS(os); + feature.setWS(ws); + feature.setArch(arch); SiteModel site = (SiteModel) objectStack.peek(); site.addFeature(feature); @@ -789,6 +796,9 @@ public class CategoryParser extends DefaultHandler { // identifier and version String id = attributes.getValue("id"); //$NON-NLS-1$ String ver = attributes.getValue("version"); //$NON-NLS-1$ + String os = attributes.getValue("os"); //$NON-NLS-1$ + String ws = attributes.getValue("ws"); //$NON-NLS-1$ + String arch = attributes.getValue("arch"); //$NON-NLS-1$ boolean noId = (id == null || id.trim().equals("")); //$NON-NLS-1$ @@ -798,6 +808,9 @@ public class CategoryParser extends DefaultHandler { bundle.setBundleIdentifier(id); bundle.setBundleVersion(ver); + bundle.setOS(os); + bundle.setWS(ws); + bundle.setArch(arch); SiteModel site = (SiteModel) objectStack.peek(); site.addBundle(bundle); |