* S3/S3Uri.py: Fixed cf:// uri parsing.

git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@478 830e0280-6d2a-0410-9c65-932aecc39d9d
fungusakafungus · Apr 11, 2011 · 44d85a4 · 44d85a4
1 parent e11560e
commit 44d85a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
 2011-04-11  Michal Ludvig  <mludvig@logix.net.nz>
 
+	* S3/S3Uri.py: Fixed cf:// uri parsing.
 	* S3/CloudFront.py: Don't fail if there are no cfinval
 	  requests.
 

diff --git a/S3/S3Uri.py b/S3/S3Uri.py
@@ -158,7 +158,7 @@ def dirname(self):
 
 class S3UriCloudFront(S3Uri):
 	type = "cf"
-	_re = re.compile("^cf://([^/]*)(/.*)?", re.IGNORECASE)
+	_re = re.compile("^cf://([^/]*)/*(.*)", re.IGNORECASE)
 	def __init__(self, string):
 		match = self._re.match(string)
 		if not match: