Hello community, here is the log from the commit of package rdiff-backup for openSUSE:Factory checked in at 2013-08-24 10:14:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rdiff-backup (Old) and /work/SRC/openSUSE:Factory/.rdiff-backup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rdiff-backup" Changes: -------- --- /work/SRC/openSUSE:Factory/rdiff-backup/rdiff-backup.changes 2012-02-21 12:24:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rdiff-backup.new/rdiff-backup.changes 2013-08-24 10:14:20.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Mar 15 10:37:23 UTC 2013 - [email protected] + +- fix os.popen2 deprecation +- add recommends for python-xattr and python-pylibacl + +------------------------------------------------------------------- New: ---- rdiff-backup-fix-deprecations.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdiff-backup.spec ++++++ --- /var/tmp/diff_new_pack.oHu0IV/_old 2013-08-24 10:14:22.000000000 +0200 +++ /var/tmp/diff_new_pack.oHu0IV/_new 2013-08-24 10:14:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rdiff-backup # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Release: 0 Url: http://www.nongnu.org/rdiff-backup/ Source0: http://savannah.nongnu.org/download/rdiff-backup/%{name}-%{version}.tar.bz2 +Patch0: rdiff-backup-fix-deprecations.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 BuildRequires: librsync-devel @@ -31,6 +32,8 @@ BuildRequires: librsync %endif BuildRequires: python-devel +Recommends: python-xattr +Recommends: python-pylibacl %py_requires %description @@ -55,6 +58,7 @@ %prep %setup -q +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ rdiff-backup-fix-deprecations.diff ++++++ Index: b/rdiff_backup/SetConnections.py =================================================================== --- a/rdiff_backup/SetConnections.py +++ b/rdiff_backup/SetConnections.py @@ -25,7 +25,7 @@ the related connections. """ -import os, sys +import os, sys, shlex, subprocess from log import Log import Globals, connection, rpath @@ -135,17 +135,15 @@ def init_connection(remote_cmd): if not remote_cmd: return Globals.local_connection Log("Executing " + remote_cmd, 4) - if os.name == "nt": - 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) - else: - stdin, stdout = os.popen2(remote_cmd) + args = shlex.split(remote_cmd) + try: + process = subprocess.Popen(args, shell=False, bufsize=-1, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + close_fds=True) + (stdin, stdout) = (process.stdin, process.stdout) + except OSError: + (stdin, stdout) = (None, None) conn_number = len(Globals.connections) conn = connection.PipeConnection(stdout, stdin, conn_number) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
