[fuse-s3fs/f15] Resolves: bz 732939

[Neil Horman]

commit 9eeb94cbb223a1f3ca5968878a6657a0bb815bb1
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Wed Aug 24 09:54:20 2011 -0400

    Resolves: bz 732939

 9bb5af3830d4f5d6156fd527630462bdb445b5ef.patch |   16 ++++++++++++++++
 fuse-s3fs.spec                                 |    8 ++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/9bb5af3830d4f5d6156fd527630462bdb445b5ef.patch b/9bb5af3830d4f5d6156fd527630462bdb445b5ef.patch
new file mode 100644
index 0000000..c651791
--- /dev/null
+++ b/9bb5af3830d4f5d6156fd527630462bdb445b5ef.patch
@@ -0,0 +1,16 @@
+diff -up ./src/s3fs.orig ./src/s3fs
+--- ./src/s3fs.orig	2008-06-06 10:02:31.000000000 -0400
++++ ./src/s3fs	2011-08-24 09:50:58.199863532 -0400
+@@ -900,10 +900,9 @@ class S3Fs(Fuse):
+ 
+ 		#Set the env correctly
+ 		if self.AWS_ACCESS_KEY_ID != None:
+-			os.putenv("AWS_ACCESS_KEY_ID",self.AWS_ACCESS_KEY_ID)
++			os.environ["AWS_ACCESS_KEY_ID"]=self.AWS_ACCESS_KEY_ID
+ 		if self.AWS_SECRET_ACCESS_KEY != None:
+-			os.putenv("AWS_SECRET_ACCESS_KEY",
+-				self.AWS_SECRET_ACCESS_KEY)
++			os.environ["AWS_SECRET_ACCESS_KEY"]=self.AWS_SECRET_ACCESS_KEY
+ 
+ 		if (os.environ.get("AWS_ACCESS_KEY_ID") == None):
+ 			print "Need to specify AWS_ACCESS_KEY_ID"
diff --git a/fuse-s3fs.spec b/fuse-s3fs.spec
index fde3230..4889ee1 100644
--- a/fuse-s3fs.spec
+++ b/fuse-s3fs.spec
@@ -1,6 +1,6 @@
 Name:		fuse-s3fs
 Version:	0.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	FUSE filesystem using Amazon Simple Storage Service as storage
 Group:		System Environment/Base
 License:	GPLv2
@@ -9,7 +9,7 @@ Source0:	https://fedorahosted.org/releases/s/3/s3fs/%{name}-%{version}.tbz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	python fuse-python python-boto
 BuildArch:	noarch
-
+Patch0: 9bb5af3830d4f5d6156fd527630462bdb445b5ef.patch
 
 %description
 This package provides a FUSE (Filesystem in User Space) application allowing
@@ -24,6 +24,7 @@ data stored on fuse-s3fs be backed up on other media as well.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -45,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 24 2011 Neil Horman <nhorman at redhat.com> - 0.7-6
+- Fix putenv useage (bz 732939)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild