[pkgsrc/trunk]: pkgsrc/sysutils/rdiff-backup Avoid using os.popen2 with Pytho...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd762fd0b298
branches:  trunk
changeset: 398077:bd762fd0b298
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Aug 23 15:23:26 2009 +0000

description:
Avoid using os.popen2 with Python>=2.6.
Patch from https://savannah.nongnu.org/bugs/?26064

Bump PKGREVISION.

diffstat:

 sysutils/rdiff-backup/Makefile         |   3 ++-
 sysutils/rdiff-backup/distinfo         |   3 ++-
 sysutils/rdiff-backup/patches/patch-aa |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r b006bb145f79 -r bd762fd0b298 sysutils/rdiff-backup/Makefile
--- a/sysutils/rdiff-backup/Makefile    Sun Aug 23 15:11:57 2009 +0000
+++ b/sysutils/rdiff-backup/Makefile    Sun Aug 23 15:23:26 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2009/08/08 16:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2009/08/23 15:23:26 wiz Exp $
 
 DISTNAME=      rdiff-backup-1.2.8
+PKGREVISION=   1
 CATEGORIES=    sysutils net
 MASTER_SITES=  http://savannah.nongnu.org/download/rdiff-backup/
 
diff -r b006bb145f79 -r bd762fd0b298 sysutils/rdiff-backup/distinfo
--- a/sysutils/rdiff-backup/distinfo    Sun Aug 23 15:11:57 2009 +0000
+++ b/sysutils/rdiff-backup/distinfo    Sun Aug 23 15:23:26 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.15 2009/03/22 15:24:37 snj Exp $
+$NetBSD: distinfo,v 1.16 2009/08/23 15:23:26 wiz Exp $
 
 SHA1 (rdiff-backup-1.2.8.tar.gz) = 14ffe4f5b46a8a96ded536c1d03ae5e85faae318
 RMD160 (rdiff-backup-1.2.8.tar.gz) = f7fb7a894afe17b495611a3738c85263ae72b2b5
 Size (rdiff-backup-1.2.8.tar.gz) = 196526 bytes
+SHA1 (patch-aa) = 658bd7a9dce3cd88dbc3b3d8839693bd5560d8cd
diff -r b006bb145f79 -r bd762fd0b298 sysutils/rdiff-backup/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/rdiff-backup/patches/patch-aa    Sun Aug 23 15:23:26 2009 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2009/08/23 15:23:26 wiz Exp $
+
+https://savannah.nongnu.org/bugs/?26064
+
+--- rdiff_backup/SetConnections.py.orig        2009-03-16 14:36:21.000000000 +0000
++++ rdiff_backup/SetConnections.py
+@@ -135,7 +135,7 @@ def init_connection(remote_cmd):
+       if not remote_cmd: return Globals.local_connection
+ 
+       Log("Executing " + remote_cmd, 4)
+-      if os.name == "nt":
++      if os.name == "nt" or map(int, sys.version.split()[0].split('.')) >= [2, 6]:
+               import subprocess
+               try:
+                       process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,