@@ -1,3 +1,9 @@

+2007-09-25  Michal Ludvig  <michal@logix.cz>

+

+	* S3/S3.py: Don't fail if bucket listing doesn't have

+	  <IsTruncated> node.

+	* s3cmd: Create ~/.s3cfg with 0600 permissions.

+

 2007-09-13  Michal Ludvig  <michal@logix.cz>

 	* s3cmd: Improved 'sync'

@@ -106,7 +106,9 @@ class S3(object):

 	def bucket_list(self, bucket, prefix = None):

 		def _list_truncated(data):

-			return getTextFromXml(data, ".//IsTruncated").lower() != "false"

+			## <IsTruncated> can either be "true" or "false" or be missing completely

+			is_truncated = getTextFromXml(data, ".//IsTruncated") or "false"

+			return is_truncated.lower() != "false"

 		def _get_contents(data):

 			return getListFromXml(data, "Contents")

@@ -9,6 +9,7 @@ import re

 import string

 import random

 import md5

+import errno

 try:

 	import xml.etree.ElementTree as ET

@@ -10,6 +10,7 @@ import logging

 import time

 import os

 import re

+import errno

 from copy import copy

 from optparse import OptionParser, Option, OptionValueError, IndentedHelpFormatter

@@ -516,7 +517,16 @@ def run_configure(config_file):

 			val = raw_input("Retry configuration? [Y/n] ")

 			if val.lower().startswith("n"):

 				raise EOFError()

+

+		## Overwrite existing config file, make it user-readable only

+		old_mask = os.umask(0077)

+		try:

+			os.remove(config_file)

+		except OSError, e:

+			if e.errno != errno.ENOENT:

+				raise

 		f = open(config_file, "w")

+		os.umask(old_mask)

 		cfg.dump_config(f)

 		f.close()

 		output("Configuration saved to '%s'" % config_file)