[fwbackups/f15] Add patch to fix attempted backup of non-existing file fdopen (#725933)

Stewart Adam firewing at fedoraproject.org
Mon Aug 22 19:31:14 UTC 2011


commit eb898df25ffe14066c6e956d477b6b3822fa3a47
Author: Stewart Adam <s.adam at diffingo.com>
Date:   Mon Aug 22 15:21:47 2011 -0400

    Add patch to fix attempted backup of non-existing file fdopen (#725933)

 fwbackups-1.43.4-fdopen.patch |   13 +++++++++++++
 fwbackups.spec                |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/fwbackups-1.43.4-fdopen.patch b/fwbackups-1.43.4-fdopen.patch
new file mode 100644
index 0000000..49094ff
--- /dev/null
+++ b/fwbackups-1.43.4-fdopen.patch
@@ -0,0 +1,13 @@
+diff --git a/src/fwbackups/operations/backup.py b/src/fwbackups/operations/backup.py
+index 76b5287..563adaf 100644
+--- a/src/fwbackups/operations/backup.py
++++ b/src/fwbackups/operations/backup.py
+@@ -118,7 +118,7 @@ class BackupOperation(operations.Common):
+     fh = os.fdopen(fd, 'w')
+     retval, stdout, stderr = fwbackups.execute('fdisk -l', env=self.environment, shell=True, stdoutfd=fh)
+     fh.close()
+-    return fh.name
++    return path
+ 
+   def parseCommand(self, config):
+     """Parse options to retrieve the correct command"""
diff --git a/fwbackups.spec b/fwbackups.spec
index d0c024d..49fe9f0 100644
--- a/fwbackups.spec
+++ b/fwbackups.spec
@@ -2,12 +2,13 @@
 
 Name:              fwbackups
 Version:           1.43.4
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A feature-rich user backup program
 Group:             Applications/Archiving
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/fwbackups/
 Source0:           http://downloads.diffingo.com/fwbackups/fwbackups-%{version}.tar.bz2
+Patch0:            fwbackups-1.43.4-fdopen.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:         noarch
 
@@ -35,6 +36,7 @@ or from the contents of an external folder or archive.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .fdopen
 
 %build
 %configure
@@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}/
 
 %changelog
+* Mon Aug 22 2011 Stewart Adam <s.adam at diffingo.com> - 1.43.4-3
+ Add patch to fix attempted backup of non-existing file fdopen (#725933)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list