commit | f70e7f49545ad70f1a0ff7014147a2cc926a851b | [log] [tgz] |
---|---|---|
author | Dejan Glozic <dejan> | Tue Jan 09 19:07:34 2007 +0000 |
committer | Dejan Glozic <dejan> | Tue Jan 09 19:07:34 2007 +0000 |
tree | 9e1ba5237f2acd462b9301322519ba26219df966 | |
parent | 4708e91be98ceb46939b169732e0682405f89f5a [diff] |
166852 Update Configurator reconciles platform.xml with newer features even for sites that have USER-INCLUDE Policy and have explicit inclusion plugin lists.
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java index d6ea937..68e6aca 100644 --- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java +++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
@@ -1218,9 +1218,11 @@ long lastChange = config.getDate().getTime(); SiteEntry[] sites = config.getSites(); for (int s=0; s<sites.length; s++) { - long siteTimestamp = sites[s].getChangeStamp(); - if (siteTimestamp > lastChange) - sites[s].loadFromDisk(lastChange); + if (sites[s].isUpdateable()) { + long siteTimestamp = sites[s].getChangeStamp(); + if (siteTimestamp > lastChange) + sites[s].loadFromDisk(lastChange); + } } config.setDirty(true); }