Libguestfs - Feb 2015 - [PATCH] builder: process --source sources before

Process the sources specified via the --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      List.concat (
       List.map (
-- 
2.1.4

On Tue, Feb 17, 2015 at 04:04:13PM +0100, Pino Toscano
wrote:
> Process the sources specified via the --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 >      List.concat (
>        List.map (
> -- 
> 2.1.4
Pretty obvious fix, so ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW