From 53f4c6eb6b57408a8b3cad412373db534a13ca1f Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 3 Jun 2018 08:17:53 -0600
Subject: fix for #511 order of dependencies (#655)

---
 src/rlx_depsolver.erl | 5 ++---
 src/rlx_release.erl   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/rlx_depsolver.erl b/src/rlx_depsolver.erl
index 9e34a2c..8a0f632 100644
--- a/src/rlx_depsolver.erl
+++ b/src/rlx_depsolver.erl
@@ -484,8 +484,7 @@ add_constraint(SrcPkg, SrcVsn, PkgsConstraints, PkgConstraint) ->
             {value, {PkgName, Constraints0}} ->
                 Constraints0
         end,
-    [{PkgName, [{PkgConstraint, {SrcPkg, SrcVsn}} | Constraints1]}
-    | lists:keydelete(PkgName, 1, PkgsConstraints)].
+    lists:keydelete(PkgName, 1, PkgsConstraints)++[{PkgName, [{PkgConstraint, {SrcPkg, SrcVsn}} | Constraints1]}].
 
 %% @doc
 %% Extend the currently active constraints correctly for the given constraints.
@@ -625,7 +624,7 @@ pkgs(DepGraph, Visited, Pkg, Constraints, OtherPkgs, PathInd) ->
     F = fun (Vsn) ->
                 Deps = get_dep_constraints(DepGraph, Pkg, Vsn),
                 UConstraints = extend_constraints(Pkg, Vsn, Constraints, Deps),
-                DepPkgs =[dep_pkg(Dep) || Dep <- Deps],
+                DepPkgs = [dep_pkg(Dep) || Dep <- Deps],
                 NewVisited = [{Pkg, Vsn} | Visited],
                 Res = all_pkgs(DepGraph, NewVisited, DepPkgs ++ OtherPkgs, UConstraints, PathInd),
                 Res
diff --git a/src/rlx_release.erl b/src/rlx_release.erl
index f2a1c35..a183043 100644
--- a/src/rlx_release.erl
+++ b/src/rlx_release.erl
@@ -384,7 +384,7 @@ parse_goal1(Release = #release_t{annotations=Annots,  goals=Goals},
         AppName ->
             {ok,
              Release#release_t{annotations=ec_dictionary:add(AppName, NewAnnots, Annots),
-                               goals = [Constraint | Goals]}}
+                               goals = Goals++[Constraint]}}
     end.
 
 -spec parse_constraint(application_constraint()) ->
-- 
cgit v1.2.3