diff options
| author | Jordan Wilberding <[email protected]> | 2013-02-02 06:10:58 -0800 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2013-02-02 06:10:58 -0800 |
| commit | 62b4f79fa00e7cc5f44621efbd4356a582fbbfb8 (patch) | |
| tree | e79b07e0b588bdb6947c3ed52c36e1977e0fbab9 /src/rcl_depsolver.erl | |
| parent | 82fb9025b27af157ea046b59bb7450ca3b07ba8d (diff) | |
| parent | 882d4fbfe65dfc812d3de9d55647f9fb468be4b4 (diff) | |
| download | relx-62b4f79fa00e7cc5f44621efbd4356a582fbbfb8.tar.gz relx-62b4f79fa00e7cc5f44621efbd4356a582fbbfb8.tar.bz2 relx-62b4f79fa00e7cc5f44621efbd4356a582fbbfb8.zip | |
Merge pull request #23 from ericbmerritt/next
support release discovery in relcool along with app discovery
Diffstat (limited to 'src/rcl_depsolver.erl')
| -rw-r--r-- | src/rcl_depsolver.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rcl_depsolver.erl b/src/rcl_depsolver.erl index e74cf3b..0cf8c88 100644 --- a/src/rcl_depsolver.erl +++ b/src/rcl_depsolver.erl @@ -471,12 +471,13 @@ add_constraint(SrcPkg, SrcVsn, PkgsConstraints, PkgConstraint) -> {value, {PkgName, Constraints0}} -> Constraints0 end, - [{PkgName, [{PkgConstraint, {SrcPkg, SrcVsn}} | Constraints1]} | - lists:keydelete(PkgName, 1, PkgsConstraints)]. + [{PkgName, [{PkgConstraint, {SrcPkg, SrcVsn}} | Constraints1]} + | lists:keydelete(PkgName, 1, PkgsConstraints)]. %% @doc %% Extend the currently active constraints correctly for the given constraints. --spec extend_constraints(pkg_name(), vsn(), constraints(),constraints()) -> [{pkg_name(), constraints()}]. +-spec extend_constraints(pkg_name(), vsn(), constraints(),constraints()) -> + [{pkg_name(), constraints()}]. extend_constraints(SrcPkg, SrcVsn, ExistingConstraints0, NewConstraints) -> lists:foldl(fun (Constraint, ExistingConstraints1) -> add_constraint(SrcPkg, SrcVsn, ExistingConstraints1, Constraint) |