diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-09 22:02:01 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-09 22:02:01 -0800 |
| commit | bd8514843e2dac56c59a566b335c89d486ad894b (patch) | |
| tree | 3014b981fc468bc61efe0279c0d47b7fb875eea7 /bin | |
| parent | 49689816166eee3d4fd4d2b1b9932398f3835341 (diff) | |
| download | portage-bd8514843e2dac56c59a566b335c89d486ad894b.tar.gz portage-bd8514843e2dac56c59a566b335c89d486ad894b.tar.bz2 portage-bd8514843e2dac56c59a566b335c89d486ad894b.zip | |
Use portage.const.EPREFIX more.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/dispatch-conf | 2 | ||||
| -rwxr-xr-x | bin/egencache | 2 | ||||
| -rwxr-xr-x | bin/portageq | 2 | ||||
| -rwxr-xr-x | bin/repoman | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 1cad9e011..75e991189 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -85,7 +85,7 @@ class dispatch: confs = [] count = 0 - config_root = os.environ.get("__PORTAGE_TEST_EPREFIX", "/") + config_root = portage.const.EPREFIX or os.sep self.options = portage.dispatch_conf.read_config(MANDATORY_OPTS) if "log-file" in self.options: diff --git a/bin/egencache b/bin/egencache index ba1f18873..532cc034c 100755 --- a/bin/egencache +++ b/bin/egencache @@ -841,7 +841,7 @@ def egencache_main(args): if options.portdir is not None: env['PORTDIR'] = options.portdir - eprefix = os.environ.get("__PORTAGE_TEST_EPREFIX") + eprefix = portage.const.EPREFIX settings = portage.config(config_root=config_root, local_config=False, env=env, _eprefix=eprefix) diff --git a/bin/portageq b/bin/portageq index e1cf1a0f7..5e488d340 100755 --- a/bin/portageq +++ b/bin/portageq @@ -842,7 +842,7 @@ def main(): sys.stderr.write("Run portageq with --help for info\n") sys.stderr.flush() sys.exit(os.EX_USAGE) - eprefix = os.environ.get("__PORTAGE_TEST_EPREFIX") + eprefix = portage.const.EPREFIX eroot = portage.util.normalize_path(sys.argv[2]) if eprefix: root = eroot[:1-len(eprefix)] diff --git a/bin/repoman b/bin/repoman index fc5000f7e..6ea15678d 100755 --- a/bin/repoman +++ b/bin/repoman @@ -95,7 +95,7 @@ os.umask(0o22) # behave incrementally. repoman_incrementals = tuple(x for x in \ portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS') -eprefix = os.environ.get("__REPOMAN_TEST_EPREFIX") +eprefix = portage.const.EPREFIX repoman_settings = portage.config(local_config=False, _eprefix=eprefix) repoman_settings.lock() |