Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-04-26 03:58:22 -0400
committerPascal Rapicault2015-10-10 21:47:19 -0400
commit09f01cdb4d4228804b1988dae7d7c00de379a38c (patch)
treef94de10c753ee28f373175abc6174b89d4ba33e0
parent161506a755e5993f088739613f8315df0d469782 (diff)
downloadrt.equinox.p2-09f01cdb4d4228804b1988dae7d7c00de379a38c.tar.gz
rt.equinox.p2-09f01cdb4d4228804b1988dae7d7c00de379a38c.tar.xz
rt.equinox.p2-09f01cdb4d4228804b1988dae7d7c00de379a38c.zip
Bug 437466 - erroneous PluginConverter message caused by a directory in
"dropins" Change-Id: I977e70e2c556af63bcf15014a5ae802e66b170c5 Signed-off-by: David Williams <david_williams@us.ibm.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
index 3307db1cc..d8b419a02 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
@@ -641,7 +641,15 @@ public class BundlesAction extends AbstractPublisherAction {
if (manifestStream != null) {
manifest = parseBundleManifestIntoModifyableDictionaryWithCaseInsensitiveKeys(manifestStream);
} else {
- manifest = convertPluginManifest(bundleLocation, true);
+ // Bug 437466 - erroneous PluginConverter message caused by a directory in "dropins"
+ // We might need the Eclipse 2.0 converter, if and only if
+ // there is a 'plugin.xml' file or "fragment.xml" file at bundle
+ // location. If there is none, it is probably "just a directory",
+ // perhaps with other bundles under it (but, drilling down in the
+ // directory is handled elsewhere, if we return null manifest here.
+ if (bundleLocation.isDirectory() && (new File(bundleLocation, PLUGIN_FILENAME_DESCRIPTOR).exists() || new File(bundleLocation, FRAGMENT_FILENAME_DESCRIPTOR).exists())) {
+ manifest = convertPluginManifest(bundleLocation, true);
+ }
}
} finally {
try {

Back to the top