Merge 75ab764 into 9156a21

mozilla · Jan 26, 2016 · 7cb7974 · 7cb7974
2 parents 9156a21 + 75ab764
commit 7cb7974
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scripts/index_walker.py b/scripts/index_walker.py
@@ -125,7 +125,8 @@
     ("https://www.mozilla.org/teach/smarton/tracking/?utm_source=directory-tiles&utm_medium=tiles&utm_content=SOTV1&utm_campaign=smarton", ("Mozilla", "Get Smart on Tracking")),
     ("https://donate.mozilla.org/?&amount=10&ref=EOYFR2015&utm_campaign=EOYFR2015&utm_source=directory-tiles&utm_medium=tiles&utm_content=dapper_v1", ("Mozilla", "Donate to Mozilla")),
     ("https://app.adjust.com/2uo1qc?campaign=tiles&adgroup=directory&creative=general&fallback=https%3A%2F%2Fitunes.apple.com%2Fapp%2Fapple-store%2Fid989804926%3Fpt%3D373246%26ct%3Dadjust_tracker%26mt%3D8I", ("Mozilla", "Firefox for iOS")),
-    ("http://mzl.la/1Dls1DC", ("Mozilla", "Firefox for Android"))
+    ("http://mzl.la/1Dls1DC", ("Mozilla", "Firefox for Android")),
+    ("https://www.mozilla.org/teach/smarton/surveillance/?utm_source=directory-tiles&utm_medium=tiles&utm_content=SOSV1&utm_campaign=smarton", ("Mozilla", "Get Smart On Surveillance"))
 ]
 
 _target_urls = {

diff --git a/splice/queries/distribution.py b/splice/queries/distribution.py
@@ -76,7 +76,10 @@ def switch_to_cdn_url(image_uri):
     from splice.environment import Environment
 
     env = Environment.instance()
-    basename = os.path.basename(image_uri)
+    try:
+        basename = os.path.basename(image_uri)
+    except:
+        basename = image_uri  # if the image_uri is a hash string, use it directly
     return os.path.join(env.config.CLOUDFRONT_BASE_URL, "images/%s" % basename)