[470900] Eclipse Mars repository for EPP causing problems for existing installations that have used Oomph
https://bugs.eclipse.org/bugs/show_bug.cgi?id=470900
diff --git a/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/CachingRepositoryManager.java b/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/CachingRepositoryManager.java
index 6e48c8a..8c23d0e 100644
--- a/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/CachingRepositoryManager.java
+++ b/plugins/org.eclipse.oomph.p2.core/src/org/eclipse/oomph/p2/internal/core/CachingRepositoryManager.java
@@ -71,7 +71,6 @@
private static final Method METHOD_removeRepository = ReflectUtil.getMethod(AbstractRepositoryManager.class, "removeRepository", URI.class, boolean.class);
-
private static final Method METHOD_exitLoad = ReflectUtil.getMethod(AbstractRepositoryManager.class, "exitLoad", URI.class);
private static final Method METHOD_broadcastChangeEvent = ReflectUtil.getMethod(AbstractRepositoryManager.class, "broadcastChangeEvent", URI.class, int.class,
@@ -120,7 +119,6 @@
return result;
}
-
// Add the repository first so that it will be enabled, but don't send add event until after the load.
added = addRepository(location, true, false);
@@ -244,6 +242,9 @@
properties.put("artifact.repository.factory.order", suffix);
}
+ // Cleanup; can be removed at some point in the future...
+ properties.remove("generated");
+
PropertiesUtil.saveProperties(cachedIndexFile, properties, false);
}