[archivemount] Do not call fuse_main() to prevent a confusing error message

Niels de Vos devos at fedoraproject.org
Sun Oct 13 16:57:50 UTC 2013


commit 9df03c69a8ccb7dee3d5d3883b663206d4abaef1
Author: Niels de Vos <devos at fedoraproject.org>
Date:   Sun Oct 13 18:54:28 2013 +0200

    Do not call fuse_main() to prevent a confusing error message
    
    Resolves: 1018587

 archivemount-0.8.1_skip-fuse_main.patch |   12 ++++++++++++
 archivemount.spec                       |    5 +++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/archivemount-0.8.1_skip-fuse_main.patch b/archivemount-0.8.1_skip-fuse_main.patch
new file mode 100644
index 0000000..a456918
--- /dev/null
+++ b/archivemount-0.8.1_skip-fuse_main.patch
@@ -0,0 +1,12 @@
+diff --git a/archivemount.c b/archivemount.c
+index bdd0778..d38fdab 100644
+--- a/archivemount.c
++++ b/archivemount.c
+@@ -2445,7 +2445,6 @@ main( int argc, char **argv )
+ 		}
+ 
+ 		/* now do the real mount */
+-		fuse_ret = fuse_main( args.argc, args.argv, &ar_oper, NULL );
+ 		res = fuse_daemonize(foreground);
+ 		if (res != -1)
+ 			res = fuse_set_signal_handlers(fuse_get_session(fuse));
diff --git a/archivemount.spec b/archivemount.spec
index 69a9282..e62a2e6 100644
--- a/archivemount.spec
+++ b/archivemount.spec
@@ -9,6 +9,7 @@ URL:           http://www.cybernoia.de/software/archivemount/
 Source0:       http://www.cybernoia.de/software/archivemount/%{name}-%{version}.tar.gz
 Patch0:        archivemount_force-single-threaded.patch
 Patch1:        fix-debuginfo.patch
+Patch2:        archivemount-0.8.1_skip-fuse_main.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:      fuse
@@ -24,6 +25,7 @@ and use it like an ordinary filesystem.
 %setup -q
 %patch0 -p1 -b .single-threaded
 %patch1 -p1 -b .fix-debuginfo
+%patch2 -p1 -b .fuse_main
 
 %build
 %configure
@@ -44,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/archivemount
 
 %changelog
+* Sun Oct 13 2013 Niels de Vos <devos at fedoraproject.org> - 0.8.1-2
+- Do not call fuse_main() to prevent a confusing error message (#1018587)
+
 * Mon Aug 19 2013 Niels de Vos <devos at fedoraproject.org> - 0.8.1-1
 - Update to version 0.8.1 (#997779)
 


More information about the scm-commits mailing list