diff options
| author | DJ Houghton | 2010-04-30 15:51:44 +0000 |
|---|---|---|
| committer | DJ Houghton | 2010-04-30 15:51:44 +0000 |
| commit | eb844289cafb82a87df1d643ac751a6247548761 (patch) | |
| tree | cceafc386815c02497af0069ad517e43a98bc2f3 /bundles/org.eclipse.equinox.p2.engine | |
| parent | 54a1c3d808b5a5920c14bf78a5637b4c3a9920ab (diff) | |
| download | rt.equinox.p2-eb844289cafb82a87df1d643ac751a6247548761.tar.gz rt.equinox.p2-eb844289cafb82a87df1d643ac751a6247548761.tar.xz rt.equinox.p2-eb844289cafb82a87df1d643ac751a6247548761.zip | |
Bug 306402 - p2 attempts to write to dropins folder in non root scenaro
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.engine')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java index 076b6191a..2231aadcf 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java @@ -51,7 +51,7 @@ public class SurrogateProfileHandler implements ISurrogateProfileHandler { private static void addSharedProfileBaseIUs(final IProfile sharedProfile, final Profile userProfile) { IQuery<IInstallableUnit> rootIUQuery = QueryUtil.createMatchQuery( // - "profileProperties[$0] == 'true' || touchpointType.id == $1",//$NON-NLS-1$ + "profileProperties[$0] == 'true' || (touchpointType != null && touchpointType.id == $1)",//$NON-NLS-1$ IProfile.PROP_PROFILE_ROOT_IU, NATIVE_TOUCHPOINT_TYPE); IQueryResult<IInstallableUnit> rootIUs = sharedProfile.query(rootIUQuery, null); for (Iterator<IInstallableUnit> iterator = rootIUs.iterator(); iterator.hasNext();) { |