From 107b27e2e4761c7261056f10603f2f35886f4d13 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 5 Sep 2010 13:20:45 +0200 Subject: [PATCH] DATADIR is no longer necessary, same trickery exists for GLOBAL_CONFIG_PATH as for DEPCACHE_PATH --- pym/portage/const.py | 2 +- pym/portage/const_autotool.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pym/portage/const.py b/pym/portage/const.py index 7029b75a0..a74e8bbaf 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -65,7 +65,7 @@ NEWS_LIB_PATH = "var/lib/gentoo" # these variables are not used with target_root or config_root DEPCACHE_PATH = "/var/cache/edb/dep" -GLOBAL_CONFIG_PATH = DATADIR + "/portage/config" +GLOBAL_CONFIG_PATH = "/usr/share/portage/config" PORTAGE_BASE_PATH = PORTAGE_BASE PORTAGE_BIN_PATH = PORTAGE_BASE_PATH + "/bin" PORTAGE_PYM_PATH = PORTAGE_BASE_PATH + "/pym" diff --git a/pym/portage/const_autotool.py b/pym/portage/const_autotool.py index 27c6906c6..d12003c46 100644 --- a/pym/portage/const_autotool.py +++ b/pym/portage/const_autotool.py @@ -3,7 +3,7 @@ # all vars that are to wind up in portage_const must have their name listed in __all__ -__all__ = ["EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE", +__all__ = ["EPREFIX", "SYSCONFDIR", "PORTAGE_BASE", "portageuser", "portagegroup", "rootuser", "rootuid", "rootgid", "PORTAGE_BASH", "PORTAGE_MV"] @@ -11,7 +11,6 @@ from os import path EPREFIX = "@PORTAGE_EPREFIX@" SYSCONFDIR = "@sysconfdir@" -DATADIR = "@datadir@" PORTAGE_BASE = "@PORTAGE_BASE@" portagegroup = "@portagegroup@" -- 2.26.2