Use proplists:unfold to make sure we feed a proplist to keymerge.

davidw · Feb 14, 2014 · d797396 · d797396 · kaos · Feb 14, 2014
1 parent 5aadc2a
commit d797396
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/rebar_erlydtl_compiler.erl b/src/rebar_erlydtl_compiler.erl
@@ -199,16 +199,17 @@ do_compile(Config, Source, Target, DtlOpts) ->
     %% versions of erlydtl.
     CompilerOptions = option(compiler_options, DtlOpts),
 
+    Sorted = proplists:unfold(
+               lists:sort(
+                 [{out_dir, option(out_dir, DtlOpts)},
+                  {doc_root, option(doc_root, DtlOpts)},
+                  {custom_tags_dir, option(custom_tags_dir, DtlOpts)},
+                  {compiler_options, CompilerOptions}
+                  |CompilerOptions])),
+
     %% ensure that doc_root and out_dir are defined,
     %% using defaults if necessary
-    Opts = lists:ukeymerge(1,
-            DtlOpts,
-            lists:sort(
-                [{out_dir, option(out_dir, DtlOpts)},
-                 {doc_root, option(doc_root, DtlOpts)},
-                 {custom_tags_dir, option(custom_tags_dir, DtlOpts)},
-                 {compiler_options, CompilerOptions}
-                 |CompilerOptions])),
+    Opts = lists:ukeymerge(1, DtlOpts, Sorted),
     ?INFO("Compiling \"~s\" -> \"~s\" with options:~n    ~s~n",
         [Source, Target, io_lib:format("~p", [Opts])]),
     case erlydtl:compile(Source,