[jhbuild] config: Correctly order XDG_DATA_DIRS when doing a partial build
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] config: Correctly order XDG_DATA_DIRS when doing a partial build
- Date: Sun, 17 Jul 2011 14:50:32 +0000 (UTC)
commit 9a3852fa592e5bb5f3b0ad6e07f3215364086481
Author: Colin Walters <walters verbum org>
Date: Sun Jul 17 10:49:17 2011 -0400
config: Correctly order XDG_DATA_DIRS when doing a partial build
Surprisingly, addpath() prepends. We need to ensure the system paths
are after, not before.
Also, fix bad copy&paste for XDG_CONFIG_DIRS.
https://bugzilla.gnome.org/show_bug.cgi?id=654768
jhbuild/config.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/jhbuild/config.py b/jhbuild/config.py
index 0220fe0..a4c0c42 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -366,16 +366,16 @@ class Config:
addpath('GI_TYPELIB_PATH', typelibpath)
# XDG_DATA_DIRS
- xdgdatadir = os.path.join(self.prefix, 'share')
- addpath('XDG_DATA_DIRS', xdgdatadir)
if self.partial_build:
addpath('XDG_DATA_DIRS', '/usr/share')
+ xdgdatadir = os.path.join(self.prefix, 'share')
+ addpath('XDG_DATA_DIRS', xdgdatadir)
# XDG_CONFIG_DIRS
+ if self.partial_build:
+ addpath('XDG_CONFIG_DIRS', '/etc')
xdgconfigdir = os.path.join(self.prefix, 'etc', 'xdg')
addpath('XDG_CONFIG_DIRS', xdgconfigdir)
- if self.partial_build:
- addpath('XDG_DATA_DIRS', '/etc')
# XCURSOR_PATH
xcursordir = os.path.join(self.prefix, 'share', 'icons')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]