[Pkg-libvirt-commits] [libguestfs] 22/72: builder: process --source sources before

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 3b76343d25414ed7a6b043e0ca0d63ee4ebd9937
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Tue Feb 17 15:48:22 2015 +0100

    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.
    
    (cherry picked from commit 17dabd57c78c021f17169fe69643a35c6c3b7ef9)
---
 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 (

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git