[Pkg-libvirt-commits] [libguestfs] 19/54: fish: change order of config files being read

[Hilko Bengen]

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

bengen pushed a commit to branch debian
in repository libguestfs.

commit 5f940d6f1cd1d0f43226920d1cf827a6ca3f1c26
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Mon Feb 17 16:24:41 2014 +0100

    fish: change order of config files being read
    
    First read the global configuration and then the local one in user's
    HOME, so the latter can really override system settings.
    
    (cherry picked from commit 8577aded9851731ae146643631eda0002bac1e20)
---
 fish/config.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/fish/config.c b/fish/config.c
index 02d850b..9e5da87 100644
--- a/fish/config.c
+++ b/fish/config.c
@@ -83,7 +83,10 @@ parse_config (void)
 {
   const char *home;
 
-  /* Try $HOME first. */
+  /* Try the global configuration first. */
+  read_config_from_file (etc_filename);
+
+  /* Read the configuration from $HOME, to override system settings. */
   home = getenv ("HOME");
   if (home != NULL) {
     CLEANUP_FREE char *path = NULL;
@@ -95,8 +98,6 @@ parse_config (void)
 
     read_config_from_file (path);
   }
-
-  read_config_from_file (etc_filename);
 }
 
 #else /* !HAVE_LIBCONFIG */

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