From 0a7bcd47aeec9a2d1c9a42ef8d9ea539a6aef0d3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 16 May 2011 13:10:26 -0400
Subject: IA: do not create bucket at initremote time

This way, the metadata sent when uploading a file is applied to the bucket
then.
---
 Remote/S3real.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Remote/S3real.hs')

diff --git a/Remote/S3real.hs b/Remote/S3real.hs
index 7d6b5d5ba..135966903 100644
--- a/Remote/S3real.hs
+++ b/Remote/S3real.hs
@@ -89,13 +89,14 @@ s3Setup u c = handlehost $ M.lookup "host" c
 			| otherwise = defaulthost
 
 		use fullconfig = do
-			genBucket fullconfig
 			gitConfigSpecialRemote u fullconfig "s3" "true"
 			s3SetCreds fullconfig	
 
 		defaulthost = do
 			c' <- encryptionSetup c
-			use $ M.union c' defaults
+			let fullconfig = M.union c' defaults
+			genBucket fullconfig
+			use fullconfig
 
 		archiveorg = do
 			showNote $ "Internet Archive mode"
@@ -112,7 +113,7 @@ s3Setup u c = handlehost $ M.lookup "host" c
 					M.union c $
 					-- special constraints on key names
 					M.insert "mungekeys" "ia" $
-					-- buckets created only as files
+					-- bucket created only when files
 					-- are uploaded
 					M.insert "x-amz-auto-make-bucket" "1" $
 					-- no default bucket name; should
-- 
cgit v1.2.3