diff options
| author | Dave Smith <dizzyd@dizzyd.com> | 2012-10-29 08:56:37 -0700 |
|---|---|---|
| committer | Dave Smith <dizzyd@dizzyd.com> | 2012-10-29 08:56:37 -0700 |
| commit | fa5c8f44ac1335f3ebd4710dac29c7e9f001496e (patch) | |
| tree | fdbc6f2781d533b9cb50624897358af86749a42f | |
| parent | 27a1bbb9dae7aad81e0ccf2912530dd98156b024 (diff) | |
| parent | 588244465f552eb4481ab7d9ff3a391cec58c8db (diff) | |
Merge pull request #1 from tuncer/ta-old-arch_string
Revert arch string changes
| -rw-r--r-- | dialyzer_reference | 2 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/dialyzer_reference b/dialyzer_reference index ff3dc50..a50bb88 100644 --- a/dialyzer_reference +++ b/dialyzer_reference @@ -1,3 +1,3 @@ rebar_eunit.erl:351: Call to missing or unexported function eunit_test:function_wrapper/2 -rebar_utils.erl:163: Call to missing or unexported function escript:foldl/3 +rebar_utils.erl:162: Call to missing or unexported function escript:foldl/3 diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index 1049c1d..bb58460 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -75,8 +75,7 @@ is_arch(ArchRegex) -> get_arch() -> Words = wordsize(), erlang:system_info(otp_release) ++ "-" - ++ erlang:system_info(system_architecture) ++ "-" ++ Words - ++ "-" ++ os_family(). + ++ erlang:system_info(system_architecture) ++ "-" ++ Words. wordsize() -> try erlang:system_info({wordsize, external}) of @@ -318,10 +317,6 @@ processing_base_dir(Config, Dir) -> %% Internal functions %% ==================================================================== -os_family() -> - {OsFamily, _} = os:type(), - atom_to_list(OsFamily). - get_deprecated_3(Get, Config, OldOpt, NewOpt, Default, When) -> case Get(Config, NewOpt, Default) of Default -> |