[pkg-java] r6427 - trunk/eclipse/debian/patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-05-08 14:47:59 +0000 (Thu, 08 May 2008)
New Revision: 6427

Modified:
   trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
Log:
update patch for eclipse 3.3

Modified: trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch	2008-05-08 14:45:49 UTC (rev 6426)
+++ trunk/eclipse/debian/patches/eclipse-jsch-sftpexception.dpatch	2008-05-08 14:47:59 UTC (rev 6427)
@@ -21,45 +21,18 @@
 exit 0
 
 @DPATCH@
---- source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java.orig	2007-09-11 08:04:11.000000000 +0200
-+++ source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java	2007-09-11 08:04:57.000000000 +0200
-@@ -882,13 +882,13 @@
-       if(attr==null){
-         try{ c.mkdir(".ssh"); } //$NON-NLS-1$
- 	catch(SftpException ee){
--	  setErrorMessage(ee.message);
-+	  setErrorMessage(ee.getMessage());
- 	  return;
- 	}
-       }
-       try{ c.cd(".ssh"); } //$NON-NLS-1$
-       catch(SftpException ee){
--	setErrorMessage(ee.message);
-+	setErrorMessage(ee.getMessage());
- 	return;
-       }
+--- source-tree/plugins/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java.orig	2008-02-29 13:21:18.000000000 +0100
++++ source-tree/plugins/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/preference/PreferencePage.java	2008-02-29 13:23:01.000000000 +0100
+@@ -886,7 +886,11 @@
+ 	      channel.connect();
+ 	      ChannelSftp c=(ChannelSftp)channel;
  
-@@ -902,7 +902,7 @@
- 	checkPermission(c, ".");                //  home directory //$NON-NLS-1$
-       }
-       catch(SftpException ee){
--	//setErrorMessage(debug+ee.message);
-+	//setErrorMessage(debug+ee.getMessage());
-       }
- 
-       MessageDialog.openInformation(getShell(),
---- source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java.orig	2008-01-07 09:30:35.000000000 +0100
-+++ source-tree/plugins/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java	2008-01-07 09:31:33.000000000 +0100
-@@ -874,7 +874,11 @@
-       channel.connect();
-       ChannelSftp c=(ChannelSftp)channel;
- 
--      /* String pwd=*/ c.pwd(); // Read off the channel
-+      try{ /* String pwd=*/ c.pwd(); } // Read off the channel
-+      catch(SftpException ee){
-+	setErrorMessage(ee.getMessage());
-+	return;
-+      }
-       SftpATTRS attr=null;
- 
-       try{ attr=c.stat(".ssh"); } //$NON-NLS-1$
+-	      /* String pwd= */c.pwd(); // Read off the channel
++	      try{ /* String pwd=*/ c.pwd(); } // Read off the channel
++	      catch(SftpException ee){
++	        setErrorMessage(ee.getMessage());
++	        return;
++	      }
+ 	      SftpATTRS attr=null;
+ 	
+ 	      try{