You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2008/04/01 23:50:45 UTC

svn commit: r643603 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java

Author: maartenc
Date: Tue Apr  1 14:50:42 2008
New Revision: 643603

URL: http://svn.apache.org/viewvc?rev=643603&view=rev
Log:
FIX: Wrong error message for republishing a module (IVY-752)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=643603&r1=643602&r2=643603&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Tue Apr  1 14:50:42 2008
@@ -75,6 +75,7 @@
 - IMPROVEMENT: Parse description and home page from poms (IVY-767)
 - IMPROVEMENT: Smarter determination if an expression is exact or not for RegexpPatternMatcher and GlobPatternMatcher
 
+- FIX: Wrong error message for republishing a module (IVY-752)
 - FIX: resolve fails to put metadata in cache (IVY-779)
 - FIX: multiple cleancache and inline retrieve error (IVY-778)
 - FIX: buildlist evicts modules with the same name, but different organisation (IVY-731)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java?rev=643603&r1=643602&r2=643603&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java Tue Apr  1 14:50:42 2008
@@ -136,7 +136,7 @@
         ChannelSftp c = getSftpChannel(destination);
         try {
             if (!overwrite && checkExistence(destination, c)) {
-                throw new IOException("destination file exists and overwrite == true");
+                throw new IOException("destination file exists and overwrite == false");
             }
             if (destination.indexOf('/') != -1) {
                 mkdirs(destination.substring(0, destination.lastIndexOf('/')), c);

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java?rev=643603&r1=643602&r2=643603&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java Tue Apr  1 14:50:42 2008
@@ -252,7 +252,7 @@
             }
             if (!overwrite) {
                 if (checkExistence(filePath, session)) {
-                    throw new IOException("destination file exists and overwrite == true");
+                    throw new IOException("destination file exists and overwrite == false");
                 }
             }
             if (path != null) {