rpms/fuse-s3fs/devel fuse-s3fs-0.4-noargs.patch, NONE, 1.1 fuse-s3fs.spec, 1.2, 1.3
Neil Horman (nhorman)
fedora-extras-commits at redhat.com
Thu Apr 24 12:52:27 UTC 2008
Author: nhorman
Update of /cvs/extras/rpms/fuse-s3fs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1624
Modified Files:
fuse-s3fs.spec
Added Files:
fuse-s3fs-0.4-noargs.patch
Log Message:
Resolves: bz 443965
fuse-s3fs-0.4-noargs.patch:
--- NEW FILE fuse-s3fs-0.4-noargs.patch ---
From: Steven Harms <thisdyingdream at gmail.com>
Date: Thu, 24 Apr 2008 12:05:23 +0000 (-0400)
Subject: Updating main routine to not dump a backtrace if no args are specified
X-Git-Url: http://git.fedorahosted.org/git/s3fs?p=s3fs.git;a=commitdiff_plain;h=916b0644e9c5fba9348dcc8f19ae5f729ef09e18
Updating main routine to not dump a backtrace if no args are specified
---
diff --git a/src/s3fs b/src/s3fs
index 12bf1f2..dc65c80 100755
--- a/src/s3fs
+++ b/src/s3fs
@@ -1284,7 +1284,7 @@ def main():
fs.main()
if __name__ == '__main__':
- if sys.argv[1] == "-h":
+ if len(sys.argv) == 1 or sys.argv[1] == "-h":
s3fs_usage()
sys.exit(0)
if sys.argv[1] == "-C":
Index: fuse-s3fs.spec
===================================================================
RCS file: /cvs/extras/rpms/fuse-s3fs/devel/fuse-s3fs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fuse-s3fs.spec 6 Apr 2008 01:41:34 -0000 1.2
+++ fuse-s3fs.spec 24 Apr 2008 12:51:51 -0000 1.3
@@ -1,6 +1,6 @@
Name: fuse-s3fs
Version: 0.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: FUSE filesystem using Amazon Simple Storage Service as storage
Group: System Environment/Base
License: GPLv2
@@ -11,6 +11,7 @@
BuildArch: noarch
Patch0: fuse-s3fs-0.4-ftruncate.patch
+Patch1: fuse-s3fs-0.4-noargs.patch
%description
This package provides a FUSE (Filesystem in User Space) application allowing
@@ -27,6 +28,7 @@
%setup -q
%patch0 -p1
+%patch1 -p1
%build
@@ -48,6 +50,9 @@
%{_mandir}/man1/*
%changelog
+* Thu Apr 24 2008 Neil Horman <nhorman at tuxdriver.com> 0.4-9
+- Backport noargs abort patch (bz 443965)
+
* Sat Apr 05 2008 Neil Horman <nhorman at tuxdriver.com> 0.4-9
- Fix ftruncate to set proper length
More information about the fedora-extras-commits
mailing list