← Back to branch summary

~ubuntu-branches/debian/sid/wagon2/sid

« back to all changes in this revision

Viewing changes to wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java

  • Committer: Package Import Robot
  • Author(s): Emmanuel Bourg
  • Date: 2015-09-02 23:46:43 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20150902234643-byu832r11djlzjbs
Tags: 2.9-1
* Team upload.
* New upstream release
  - Refreshed the patches
* Removed the build dependency on libmaven-enforcer-plugin-java
* No longer build and install the unused wagon-scm and wagon-ssh modules
  to reduce the dependencies of libwagon2-java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/ScpHelper.java
47
47
 
48
48
/**
49
49
 * Scp helper for general algorithms on ssh server.
50
 
 * See {@link #putDirectory(Wagon, File, String) putDirectory(...)} for more info on bulk directory upload. 
 
50
 * See {@link #putDirectory(Wagon, File, String) putDirectory(...)} for more info on bulk directory upload.
51
51
 */
52
52
public class ScpHelper
53
53
{
260
260
        {
261
261
            //executor.executeCommand(
262
262
            //    "cd " + path + "; unzip -q -o " + zipFile.getName() + "; rm -f " + zipFile.getName() );
263
 
            executor.executeCommand( "cd \"" + path + "\"; unzip -q -o \"" + zipFile.getName() + "\"; rm -f \"" + zipFile.getName() + "\"" );
 
263
            executor.executeCommand( "cd \"" + path + "\"; unzip -q -o \"" + zipFile.getName() + "\"; rm -f \""
 
264
                + zipFile.getName() + "\"" );
264
265
 
265
266
            zipFile.delete();
266
267
 
293
294
            //Streams streams = executor.executeCommand( "ls -FlA " + path, false );
294
295
            Streams streams = executor.executeCommand( "ls -FlA \"" + path + "\"", false );
295
296
 
296
 
            List<String> ret = new LSParser().parseFiles( streams.getOut() );
297
 
            if ( ret == null || ret.isEmpty() )
298
 
            {
299
 
                throw new ResourceDoesNotExistException( "No such file or directory" );
300
 
            }
301
 
            return ret;
 
297
            return new LSParser().parseFiles( streams.getOut() );
302
298
        }
303
299
        catch ( CommandExecutionException e )
304
300
        {