You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by mc...@apache.org on 2011/10/17 19:28:09 UTC

svn commit: r1185296 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

Author: mcculls
Date: Mon Oct 17 17:28:09 2011
New Revision: 1185296

URL: http://svn.apache.org/viewvc?rev=1185296&view=rev
Log:
Try to avoid merging with previously generated manifests

Modified:
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1185296&r1=1185295&r2=1185296&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Mon Oct 17 17:28:09 2011
@@ -621,9 +621,10 @@ public class BundlePlugin extends Abstra
 
             Manifest mavenManifest = new Manifest();
 
-            // First grab the external manifest file (if specified)
+            // First grab the external manifest file (if specified and different to target location)
             File externalManifestFile = archiveConfig.getManifestFile();
-            if ( null != externalManifestFile && externalManifestFile.exists() )
+            if ( null != externalManifestFile && externalManifestFile.exists()
+                && !externalManifestFile.equals( new File( manifestLocation, "MANIFEST.MF" ) ) )
             {
                 InputStream mis = new FileInputStream( externalManifestFile );
                 mavenManifest.read( mis );