@@ -1,5 +1,10 @@

 2008-09-15  Michal Ludvig  <michal@logix.cz>

+	* Merge from trunk, revision 221:

+	* s3cmd: Refuse 'sync' together with '--encrypt'.

+

+2008-09-15  Michal Ludvig  <michal@logix.cz>

+

 	* Merge from trunk, revisions 218, 226, 233, 234:

 	* s3cmd, S3/S3.py, S3/Config.py: Allow access to upper-case

 	  named buckets again with --use-old-connect-method 

@@ -559,7 +559,14 @@ def cmd_sync_local2remote(src, dst):

 		for k in attrs: result += "%s:%s/" % (k, attrs[k])

 		return { 'x-amz-meta-s3cmd-attrs' : result[:-1] }

-	s3 = S3(Config())

+	s3 = S3(cfg)

+

+	if cfg.encrypt:

+		error("S3cmd 'sync' doesn't support GPG encryption, sorry.")

+		error("Either use unconditional 's3cmd put --recursive'")

+		error("or disable encryption with --no-encryption parameter.")

+		sys.exit(1)

+

 	src_uri = S3Uri(src)

 	dst_uri = S3Uri(dst)