rpms/rdiff-backup/EL-6 rdiff-backup--popen2.patch, NONE, 1.1 rdiff-backup.spec, 1.33, 1.34

[Kevin Fenzi]

Author: kevin

Update of /cvs/pkgs/rpms/rdiff-backup/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22348

Modified Files:
	rdiff-backup.spec 
Added Files:
	rdiff-backup--popen2.patch 
Log Message:
Add patch for cosmetic popen warning. Fixes bug #528940


rdiff-backup--popen2.patch:
 SetConnections.py |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

--- NEW FILE rdiff-backup--popen2.patch ---
diff -Nur rdiff-backup-1.2.8.orig/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py
--- rdiff-backup-1.2.8.orig/rdiff_backup/SetConnections.py	2009-10-14 15:01:14.649750067 +0400
+++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py	2009-10-14 16:01:13.066376858 +0400
@@ -135,15 +135,13 @@
 	if not remote_cmd: return Globals.local_connection
 
 	Log("Executing " + remote_cmd, 4)
-	if os.name == "nt":
+	if sys.version_info > (2, 4):
 		import subprocess
-		try:
-			process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,
-								stdin=subprocess.PIPE, 
-								stdout=subprocess.PIPE)
-			(stdin, stdout) = (process.stdin, process.stdout)
-		except OSError:
-			(stdin, stdout) = (None, None)
+		shell = os.name != "nt"
+		process = subprocess.Popen(remote_cmd, shell=shell, bufsize=0,
+							stdin=subprocess.PIPE, 
+							stdout=subprocess.PIPE)
+		(stdin, stdout) = (process.stdin, process.stdout)
 	else:
 		stdin, stdout = os.popen2(remote_cmd)
 	conn_number = len(Globals.connections)


Index: rdiff-backup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rdiff-backup/EL-6/rdiff-backup.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- rdiff-backup.spec	27 Jul 2009 02:52:14 -0000	1.33
+++ rdiff-backup.spec	25 Jun 2010 17:21:03 -0000	1.34
@@ -3,10 +3,14 @@
 Version: 1.2.8
 Summary: Convenient and transparent local/remote incremental mirror/backup
 Name: rdiff-backup
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 URL: http://www.nongnu.org/rdiff-backup/
 Source: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
+#
+# Upstream bug: https://savannah.nongnu.org/bugs/?26064
+#
+Patch0: http://dev.sgu.ru/rpm/rdiff-backup--popen2.patch
 License: GPLv2+
 Group: Applications/Archiving
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +34,8 @@ differences from the previous backup wil
 %prep
 %setup -q
 
+%patch0 -p1
+
 %build
 python setup.py build
 
@@ -58,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Mar 20 2010 Kevin Fenzi <kevin at tummy.com> - 1.2.8-4
+- Add patch for cosmetic popen warning. Fixes bug #528940
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild