rpms/duplicity/FC-3 duplicity-0.4.2-sftp.patch, NONE, 1.1 duplicity.spec, 1.7, 1.8 duplicity-0.4.2-scp.patch, 1.1, NONE

[Robert Scheck (robert)]

Author: robert

Update of /cvs/extras/rpms/duplicity/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4991

Modified Files:
	duplicity.spec 
Added Files:
	duplicity-0.4.2-sftp.patch 
Removed Files:
	duplicity-0.4.2-scp.patch 
Log Message:
fix broken sftp support by adding --sftp-command (#220316)


duplicity-0.4.2-sftp.patch:

--- NEW FILE duplicity-0.4.2-sftp.patch ---
Adds support for --sftp-command option - thanks to intrigeri <intrigeri at boum.org>.

--- duplicity-0.4.2/src/commandline.py		2006-02-03 04:44:31.000000000 +0100
+++ duplicity-0.4.2/src/commandline.py.sftp	2006-12-20 14:15:38.000000000 +0100
@@ -50,7 +50,7 @@
 		  "list-current-files", "no-encryption",
 		  "no-print-statistics", "null-separator",
 		  "remove-older-than=", "restore-dir=", "restore-time=",
-		  "scp-command=", "short-filenames", "sign-key=",
+		  "scp-command=", "sftp-command=", "short-filenames", "sign-key=",
 		  "ssh-command=", "verbosity=", "verify", "version"])
 	except getopt.error, e:
 		command_line_error("%s" % (str(e),))
@@ -95,6 +95,7 @@
 		elif opt == "-t" or opt == "--restore-time":
 			globals.restore_time = dup_time.genstrtotime(arg)
 		elif opt == "--scp-command": backends.scp_command = arg
+		elif opt == "--sftp-command": backends.sftp_command = arg
 		elif opt == "--short-filenames": globals.short_filenames = 1
 		elif opt == "--sign-key": set_sign_key(arg)
 		elif opt == "--ssh-command": backends.ssh_command = arg
--- duplicity-0.4.2/duplicity.1			2006-02-03 04:44:31.000000000 +0100
+++ duplicity-0.4.2/duplicity.1.sftp		2006-12-20 14:24:58.000000000 +0100
@@ -271,6 +271,13 @@
 give extra arguments to scp, for instance "--scp-command \'scp -i
 foo\'".  The default is "scp".
 .TP
+.BI "--sftp-command " command
+This option only matters when using the ssh/scp backend.  There
+.I command
+will be used instead of sftp for listing and deleting files.  The
+default is "sftp".  For more information see
+.BR --scp-command .
+.TP
 .BI "--sign-key " key
 This option can be used when backing up or restoring.  When backing
 up, all backup files will be signed with keyid


Index: duplicity.spec
===================================================================
RCS file: /cvs/extras/rpms/duplicity/FC-3/duplicity.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- duplicity.spec	17 Dec 2006 13:54:39 -0000	1.7
+++ duplicity.spec	20 Dec 2006 13:41:17 -0000	1.8
@@ -3,13 +3,13 @@
 Summary:        Encrypted bandwidth-efficient backup using rsync algorithm
 Name:           duplicity
 Version:        0.4.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL
 Group:          Applications/Archiving
 URL:            http://www.nongnu.org/duplicity/
 Source:         http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
 Patch0:         duplicity-0.4.1-timeout.patch
-Patch1:         duplicity-0.4.2-scp.patch
+Patch1:         duplicity-0.4.2-sftp.patch
 Requires:       gnupg >= 1.0.6
 %if "%{?fedora}" <= "3"
 Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -32,7 +32,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .timeout
-%patch1 -p1 -b .scp
+%patch1 -p1 -b .sftp
 
 %build
 %{__python} setup.py build
@@ -56,6 +56,9 @@
 %{python_sitearch}/%{name}/*.so
 
 %changelog
+* Wed Dec 20 2006 Robert Scheck <robert at fedoraproject.org> 0.4.2-6
+- fix broken sftp support by adding --sftp-command (#220316)
+
 * Sun Dec 17 2006 Robert Scheck <robert at fedoraproject.org> 0.4.2-5
 - own %%{python_sitearch}/%%{name} and not only %%{python_sitearch}
 


--- duplicity-0.4.2-scp.patch DELETED ---