[PATCH] Fix duplicity manpage

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] Fix duplicity manpage

trondd-2
Seems that with the change to duplicity 0.7, the default sftp backend changed.
The manpage was being patched to say the default was pexpect over paramiko.
This is no longer true.  Remove the manpage changes.

Not sure if the REVISION needs to be bumped or not for this.

Tim.

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile 17 Jan 2016 05:30:31 -0000 1.35
+++ Makefile 7 Feb 2016 22:17:35 -0000
@@ -7,6 +7,7 @@ COMMENT = encrypted backup using rsync a
 
 MODPY_EGG_VERSION = 0.7.06
 DISTNAME = duplicity-${MODPY_EGG_VERSION}
+REVISION = 0
 
 CATEGORIES = sysutils
 
Index: patches/patch-bin_duplicity_1
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/patches/patch-bin_duplicity_1,v
retrieving revision 1.3
diff -u -p -r1.3 patch-bin_duplicity_1
--- patches/patch-bin_duplicity_1 17 Jan 2016 05:30:31 -0000 1.3
+++ patches/patch-bin_duplicity_1 7 Feb 2016 22:17:35 -0000
@@ -19,18 +19,6 @@ Document the ssh backend change from par
 
  .TP
  .BI "--ssl-cacert-file " file
-@@ -1151,9 +1150,9 @@ scp://.. or
- .br
- sftp://user[:password]@other.host[:port]/[relative|/absolute]_path
- .PP
--.BR "defaults" " are paramiko+scp:// and paramiko+sftp://"
-+.BR "defaults" " are pexpect+scp://, pexpect+sftp://, lftp+sftp://"
- .br
--.BR "alternatively" " try pexpect+scp://, pexpect+sftp://, lftp+sftp://"
-+.BR "alternatively" " try paramiko+scp:// and paramiko+sftp://"
- .br
- See also
- .BR --ssh-askpass ,
 @@ -1471,7 +1470,7 @@ which aren't followed by 'foo'.  However, it wouldn't
  if /home/ben/1234567 existed.
 
@@ -40,39 +28,3 @@ Document the ssh backend change from par
  installed on the system.
  See
  .B REQUIREMENTS
-@@ -1764,7 +1763,7 @@ about the requirements for a server to support
- .I scp/ssh
- access.
- To make it even more confusing the user can choose between several ssh backends via a scheme prefix:
--paramiko+ (default), pexpect+, lftp+... .
-+paramiko+, pexpect+ (default), lftp+... .
- .br
- paramiko & pexpect support
- .BR --use-scp ,
-@@ -1776,7 +1775,7 @@ backend allows to define
- .BR --scp-command " and"
- .BR --sftp-command .
- .PP
--.BR "SSH paramiko backend " "(default)"
-+.BR "SSH paramiko backend"
- is a complete reimplementation of ssh protocols natively in python. Advantages
- are speed and maintainability. Minor disadvantage is that extra packages are
- needed as listed in
-@@ -1789,7 +1788,7 @@ mode (
- .I --use-scp
- ) though scp access is used for put/get operations but listing is done via ssh remote shell.
- .PP
--.B SSH pexpect backend
-+.BR "SSH pexpect backend" " (selected by default on OpenBSD)"
- is the legacy ssh backend using the command line ssh binaries via pexpect.
- Older versions used
- .I scp
-@@ -2050,7 +2049,7 @@ see pydrive backend
- (Python Cryptography Toolkit)
- - http://www.dlitz.net/software/pycrypto/
- .TP
--.B ssh pexpect backend
-+.BR "ssh pexpect backend" " (default on OpenBSD)"
- .B sftp/scp client binaries
- OpenSSH - http://www.openssh.com/
- .br

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Fix duplicity manpage

Jeremie Courreges-Anglas-2
[hidden email] writes:

> Seems that with the change to duplicity 0.7, the default sftp backend changed.
> The manpage was being patched to say the default was pexpect over paramiko.
> This is no longer true.  Remove the manpage changes.

Was there a rationale for changing the default again?

> Not sure if the REVISION needs to be bumped or not for this.

It would.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Fix duplicity manpage

trondd-2
On Mon, February 8, 2016 7:59 am, Jérémie Courrèges-Anglas wrote:

> [hidden email] writes:
>
>> Seems that with the change to duplicity 0.7, the default sftp backend
>> changed.
>> The manpage was being patched to say the default was pexpect over
>> paramiko.
>> This is no longer true.  Remove the manpage changes.
>
> Was there a rationale for changing the default again?
>
>

Ok, it looks like we used to patch the default in globals.py but that
variable isn't there anymore so the patch went away.

Would we rather change the default (however that would work in 0.7) to
pexpect again?  Paramiko doesn't work for me as it doesn't understand
ed25519 ssh keys but I don't know if that is a global problem for all
OpenBSD users.

Tim.

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Fix duplicity manpage

Daniel Jakots
On Mon, 8 Feb 2016 17:51:00 -0500, "trondd" <[hidden email]>
wrote:

> On Mon, February 8, 2016 7:59 am, Jérémie Courrèges-Anglas wrote:
> > [hidden email] writes:
> >  
> >> Seems that with the change to duplicity 0.7, the default sftp
> >> backend changed.
> >> The manpage was being patched to say the default was pexpect over
> >> paramiko.
> >> This is no longer true.  Remove the manpage changes.  
> >
> > Was there a rationale for changing the default again?
> >
>
> Ok, it looks like we used to patch the default in globals.py but that
> variable isn't there anymore so the patch went away.
>
> Would we rather change the default (however that would work in 0.7) to
> pexpect again?  Paramiko doesn't work for me as it doesn't understand
> ed25519 ssh keys but I don't know if that is a global problem for all
> OpenBSD users.
>

Sorry for the late answer.

I think this patch (versus "duplicity restore pexpect as default ssh
backend") is better as I think we should stay as close to upstream as
possible and if paramiko doesn't fit one's needs, adding "+pexpect" to
the scheme to change the back-end is easily done.

The patch looks good to me, thanks Tim.

Cheers,
Daniel

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Fix duplicity manpage

Jeremie Courreges-Anglas-2
Daniel Jakots <[hidden email]> writes:

> On Mon, 8 Feb 2016 17:51:00 -0500, "trondd" <[hidden email]>
> wrote:
>
>> On Mon, February 8, 2016 7:59 am, Jérémie Courrèges-Anglas wrote:
>> > [hidden email] writes:
>> >  
>> >> Seems that with the change to duplicity 0.7, the default sftp
>> >> backend changed.
>> >> The manpage was being patched to say the default was pexpect over
>> >> paramiko.
>> >> This is no longer true.  Remove the manpage changes.  
>> >
>> > Was there a rationale for changing the default again?
>> >
>>
>> Ok, it looks like we used to patch the default in globals.py but that
>> variable isn't there anymore so the patch went away.
>>
>> Would we rather change the default (however that would work in 0.7) to
>> pexpect again?  Paramiko doesn't work for me as it doesn't understand
>> ed25519 ssh keys but I don't know if that is a global problem for all
>> OpenBSD users.
>>
>
> Sorry for the late answer.
>
> I think this patch (versus "duplicity restore pexpect as default ssh
> backend") is better as I think we should stay as close to upstream as
> possible and if paramiko doesn't fit one's needs, adding "+pexpect" to
> the scheme to change the back-end is easily done.
>
> The patch looks good to me, thanks Tim.

Committed, thanks.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE