commit 07d012e97f6d15d02370a9c3ae08a720b31f31f0
author David Chen <dzc@google.com> Wed Nov 30 19:40:17 2016 +0000
committer Irina Iancu <elenairina@google.com> Thu Dec 01 10:15:55 2016 +0000
tree da08324486cf9165fa2a991a0964401d6f216215
parent b89f30e129a4ef6eb1e81fb865117e4845892d74

Enable fallback URLs in Skylark http rules.

RELNOTES: Enable fallback URLs in Skylark http rules.

--
MOS_MIGRATED_REVID=140630438

tools/build_defs/repo/http.bzl

diff --git a/tools/build_defs/repo/http.bzl b/tools/build_defs/repo/http.bzl
index af222d8..28c4a79 100644
--- a/tools/build_defs/repo/http.bzl
+++ b/tools/build_defs/repo/http.bzl
@@ -35,14 +35,11 @@
   if ctx.attr.build_file and ctx.attr.build_file_content:
     ctx.fail("Only one of build_file and build_file_content can be provided.")
 
-  # TODO(dzc,jart): Implement fallback URLs when available.
-  if len(ctx.attr.urls) > 1:
-    ctx.fail("Multiple urls are not yet supported.")
-  url = ctx.attr.urls[0]
-  ctx.download_and_extract(url, "", ctx.attr.sha256, ctx.attr.type,
+  ctx.download_and_extract(ctx.attr.urls, "", ctx.attr.sha256, ctx.attr.type,
                            ctx.attr.strip_prefix)
   ctx.file("WORKSPACE", "workspace(name = \"{name}\")\n".format(name=ctx.name))
   if ctx.attr.build_file:
+    print("ctx.attr.build_file %s" % str(ctx.attr.build_file))
     ctx.symlink(ctx.attr.build_file, "BUILD")
   else:
     ctx.file("BUILD", ctx.attr.build_file_content)
@@ -59,11 +56,8 @@
 
 def _http_file_impl(ctx):
   """Implementation of the http_file rule."""
-  # TODO(dzc,jart): Implement fallback URLs when available.
-  if len(ctx.attr.urls) > 1:
-    ctx.fail("Multiple urls are not yet supported.")
-  url = ctx.attr.urls[0]
-  ctx.download(url, "file/downloaded", ctx.attr.sha256, ctx.attr.executable)
+  ctx.download(ctx.attr.urls, "file/downloaded", ctx.attr.sha256,
+               ctx.attr.executable)
   ctx.file("WORKSPACE", "workspace(name = \"{name}\")".format(name=ctx.name))
   ctx.file("file/BUILD", _HTTP_FILE_BUILD)
 
@@ -123,7 +117,7 @@
       name = "my_ssl",
       urls = ["http://example.com/openssl.zip"],
       sha256 = "03a58ac630e59778f328af4bcc4acb4f80208ed4",
-      build_file = "openssl.BUILD",
+      build_file = "//:openssl.BUILD",
   )
   ```