* S3/CloudFront.py: Don't fail if there are no cfinval

requests. git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@477 830e0280-6d2a-0410-9c65-932aecc39d9d
s3tools · Apr 11, 2011 · 16f6c3e · 16f6c3e
1 parent d065ce3
commit 16f6c3e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-11  Michal Ludvig  <mludvig@logix.net.nz>
+
+	* S3/CloudFront.py: Don't fail if there are no cfinval
+	  requests.
+
 2011-04-11  Michal Ludvig  <mludvig@logix.net.nz>
 
 	* S3/PkgInfo.py: Updated to 1.1.0-beta1

diff --git a/S3/CloudFront.py b/S3/CloudFront.py
@@ -721,8 +721,11 @@ def invalinfo(args):
 				requests.append(str(cfuri))
 			else:
 				inval_list = cf.GetInvalList(cfuri)
-				for i in inval_list['inval_list'].info['InvalidationSummary']:
+				try:
-					requests.append("/".join(["cf:/", cfuri.dist_id(), i["Id"]]))
+					for i in inval_list['inval_list'].info['InvalidationSummary']:
+						requests.append("/".join(["cf:/", cfuri.dist_id(), i["Id"]]))
+				except:
+					continue
 		for req in requests:
 			cfuri = S3Uri(req)
 			inval_info = cf.GetInvalInfo(cfuri)