rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug in p2 Droplet detection of feature groups.

This commit is contained in:
Roland Grunberg 2017-01-25 14:09:06 -05:00
parent 6d183461b5
commit 7de04d1d88
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eclipse-adjust-droplets.patch
View File

@ -50,3 +50,21 @@ index 12e4d89..77945ef 100644
// new magic - multiple info files, f.e.
// egit.info (git feature)
// cdt.link (properties file containing link=path) to other info file
diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
index 3d7e313..debbfb8 100644
--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
@@ -238,10 +238,11 @@ public class SurrogateProfileHandler implements ISurrogateProfileHandler {
|| "feature".equals(cap.getName())) { //$NON-NLS-1$
featureOrBundle = true;
}
- } else if (Boolean.TRUE.equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
- featureOrBundle = true;
}
}
+ if (Boolean.TRUE.toString().equals(unit.getProperties().get("org.eclipse.equinox.p2.type.group"))) { //$NON-NLS-1$
+ featureOrBundle = true;
+ }
if (featureOrBundle && !added.contains(unit)) {
added.add(unit);
sharedProfile.addInstallableUnit(unit);

5
eclipse.spec
View File

@ -47,7 +47,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: 4.6.2
Release: 5%{?dist}
Release: 6%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -1127,6 +1127,9 @@ fi
%{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Wed Jan 25 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-6
- Fix bug in p2 Droplet detection of feature groups.
* Tue Jan 24 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-5
- Hide the p2 Droplets from cluttering Install Wizard Combo.
- Resolves: rhbz#1413778