diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java')
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java | 10 |
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 { |