maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r552935 - /maven/sandbox/trunk/plugins/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
Date Tue, 03 Jul 2007 18:07:16 GMT
Author: jmcconnell
Date: Tue Jul  3 11:07:15 2007
New Revision: 552935

URL: http://svn.apache.org/viewvc?view=rev&rev=552935
Log:
< is not needed, patch takes a -i option for the input file

Modified:
    maven/sandbox/trunk/plugins/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java

Modified: maven/sandbox/trunk/plugins/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java?view=diff&rev=552935&r1=552934&r2=552935
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
(original)
+++ maven/sandbox/trunk/plugins/maven-patch-plugin/src/main/java/org/apache/maven/plugin/patch/ApplyMojo.java
Tue Jul  3 11:07:15 2007
@@ -24,7 +24,6 @@
 import org.codehaus.plexus.util.cli.CommandLineUtils;
 import org.codehaus.plexus.util.cli.Commandline;
 import org.codehaus.plexus.util.cli.StreamConsumer;
-import org.codehaus.plexus.util.cli.Commandline.Argument;
 //import org.codehaus.plexus.util.cli.shell.BourneShell;
 
 import java.io.File;
@@ -430,6 +429,8 @@
                 getLog().info( "Applying patch: " + patchName );
                 int result = executeCommandLine( cli, consumer, consumer );
 
+                getLog().info( "patch command returned: " + result );
+                
                 if ( result != 0 )
                 {
                     if ( failFast )
@@ -579,7 +580,7 @@
             //cli.createArg().setLine( "-b" );
         }
 
-        cli.createArgument().setLine( " < " + patchFile.getAbsolutePath() );
+        cli.createArgument().setLine( "-i " +  patchFile.getAbsolutePath() );
         //cli.createArg().setLine( " < " + patchFile.getAbsolutePath() );
 
         return cli;



Mime
View raw message