search for: c7f1dae

...--source command line arguments before sources read from repositories, so the former have a chance to "override" the latter. Related to RHBZ#1193238. --- builder/builder.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/builder.ml b/builder/builder.ml index c7f1dae..a519913 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -158,7 +158,7 @@ let main () = proxy = Downloader.SystemProxy; } ) sources in - let sources = List.append repos sources in + let sources = List.append sources repos in let index : Index_parser.index =...

...le.am @@ -132,11 +132,11 @@ deps = \ languages.cmx \ get_kernel.cmx \ cache.cmx \ + sources.cmx \ downloader.cmx \ sigchecker.cmx \ index_parser.cmx \ list_entries.cmx \ - sources.cmx \ cmdline.cmx \ builder.cmx diff --git a/builder/builder.ml b/builder/builder.ml index af61538..c7f1dae 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -150,22 +150,23 @@ let main () = (* Download the sources. *) let downloader = Downloader.create ~verbose ~curl ~cache in let repos = Sources.read_sources ~prog ~verbose in - let repos = List.map ( - fun { Sources.uri = uri; So...

No functional change, just code motion. --- builder/builder.ml | 6 +++--- builder/list_entries.ml | 12 ++++++------ builder/list_entries.mli | 2 +- builder/sigchecker.ml | 5 ----- builder/sigchecker.mli | 7 +------ builder/utils.ml | 5 +++++ 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/builder/builder.ml b/builder/builder.ml index