From 209c02ec57c2cc3207ee0174c3af3675b8dc8f79 Mon Sep 17 00:00:00 2001
From: Bryan Paxton <39971740+starbelly@users.noreply.github.com>
Date: Thu, 7 Mar 2019 10:54:01 -0600
Subject: Fix fetching of private packages from orgs on hex repos (#2020)

- vendor in hex_core at v0.5.0
  - Change where repo_name should be the org and not the parent
  - Changed rebar_utils:url_append_path/2 to not explicitly add a '?',
    this is returned in the Query chunk by http_uri:parse/1 (e.g., "?foo=bar")
  - update organization_merging test to expect the sub-repo as the repo_name
  - Add tests for rebar_utils:url_append_path/2
  - Stop referencing/setting "organization" in config and use new
     organization settings (api_repository and repo_organization)
  - Do not set (assume) the read key is valid for any/every repo
  - Set repo_organization and api_repository to org
  - Update tests to check for new config opts
---
 bootstrap | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap b/bootstrap
index fd9f99e..61b7dc3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -15,6 +15,11 @@ main(_) ->
     %% a changed structure from an older one
     rm_rf("_build/bootstrap"),
 
+    %% We fetch a few deps from hex for boostraping,
+    %% so we must compile r3_safe_erl_term.xrl which
+    %% is part of hex_core.
+    compile_xrl_file("src/r3_safe_erl_term.xrl"),
+
     %% Fetch and build deps required to build rebar3
     BaseDeps = [{providers, []}
                ,{getopt, []}
@@ -22,8 +27,7 @@ main(_) ->
                ,{erlware_commons, ["ec_dictionary.erl", "ec_vsn.erl"]}
                ,{parse_trans, ["parse_trans.erl", "parse_trans_pp.erl",
                                "parse_trans_codegen.erl"]}
-               ,{certifi, []}
-               ,{hex_core, []}],
+               ,{certifi, []}],
     Deps = get_deps(),
     [fetch_and_compile(Dep, Deps) || Dep <- BaseDeps],
 
@@ -143,7 +147,7 @@ compile(App, FirstFiles) ->
     [compile_xrl_file(X) || X <- LeexFiles],
     YeccFiles = filelib:wildcard(filename:join([Dir, "src", "*.yrl"])),
     [compile_yrl_file(X) || X <- YeccFiles],
-    Sources = FirstFilesPaths ++ filelib:wildcard(filename:join([Dir, "src", "*.erl"])),
+    Sources =  FirstFilesPaths ++ filelib:wildcard(filename:join([Dir, "src", "*.erl"])),
     [compile_erl_file(X, [{i, filename:join(Dir, "include")}
                      ,debug_info
                      ,{outdir,  filename:join(Dir, "ebin")}
@@ -175,7 +179,7 @@ bootstrap_rebar3() ->
     Res = symlink_or_copy(filename:absname("src"),
                           filename:absname("_build/default/lib/rebar/src")),
     true = Res == ok orelse Res == exists,
-    Sources = ["src/rebar_resource_v2.erl", "src/rebar_resource.erl" | filelib:wildcard("src/*.erl")],
+    Sources = ["src/rebar_resource_v2.erl", "src/rebar_resource.erl" | filelib:wildcard("src/*.erl") ],
     [compile_erl_file(X, [{outdir, "_build/default/lib/rebar/ebin/"}
                      ,return | additional_defines()]) || X <- Sources],
     code:add_patha(filename:absname("_build/default/lib/rebar/ebin")).
-- 
cgit v1.1