rpms/fwbackups/F-11 fwbackups-1.43.3rc4-stdoutfd.patch, NONE, 1.1 fwbackups.spec, 1.30, 1.31

Stewart Adam firewing at fedoraproject.org
Fri Sep 4 23:55:14 UTC 2009


Author: firewing

Update of /cvs/pkgs/rpms/fwbackups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27342/F-11

Modified Files:
	fwbackups.spec 
Added Files:
	fwbackups-1.43.3rc4-stdoutfd.patch 
Log Message:
* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
- Add patch to fix stdoufd bug during backups


fwbackups-1.43.3rc4-stdoutfd.patch:
 __init__.py.in |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE fwbackups-1.43.3rc4-stdoutfd.patch ---
--- a/src/fwbackups/__init__.py.in
+++ b/src/fwbackups/__init__.py.in
@@ -58,14 +58,14 @@ class fwbackupsError(Exception):
   def __str__(self):
     return repr(self.value)
 
-def execute(command, env=None, shell=False):
+def execute(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command, wait for it to finish"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub.wait(), sub.stdout, sub.stderr
 
-def executeSub(command, env=None, shell=False):
+def executeSub(command, env=None, shell=False, stdoutfd=subprocess.PIPE):
   """Execute a command in the background"""
-  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=shell, env=env)
+  sub = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=stdoutfd, stderr=subprocess.PIPE, shell=shell, env=env)
   return sub
 
 def kill(PID, signal):


Index: fwbackups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fwbackups/F-11/fwbackups.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- fwbackups.spec	22 Aug 2009 20:25:40 -0000	1.30
+++ fwbackups.spec	4 Sep 2009 23:55:13 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:              fwbackups
 Version:           1.43.3
-Release:           0.6.rc4%{?dist}
+Release:           0.7.rc4%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
@@ -11,6 +11,8 @@ Source0:           http://downloads.diff
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
+Patch0:            fwbackups-1.43.3rc4-stdoutfd.patch
+
 BuildRequires:     desktop-file-utils
 # Pulls gettext, autotools
 BuildRequires:     intltool
@@ -34,6 +36,7 @@ or from the contents of an external fold
 
 %prep
 %setup -q -n %{name}-%{version}rc4
+%patch0 -p1 -b .stdoutfd
 
 %build
 %configure
@@ -67,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}/
 
 %changelog
+* Fri Sep 4 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.7.rc4
+- Add patch to fix stdoufd bug during backups
+
 * Sat Aug 22 2009 Stewart Adam <s.adam at diffingo.com> 1.43.3-0.6.rc4
 - Update to 1.43.3rc4 (fixes #518690)
 




More information about the fedora-extras-commits mailing list