From ff6b13e3241b4f7bc7ef07850bec924e98856b27 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 20 Dec 2007 06:10:42 +0000 Subject: Make some adjustments so that it's possible to install binary packages without having a portage tree: * Make portdbapi.aux_get() return early by raising a KeyError if it detects that there is no portage tree. * Move the ARCH and USERLAND sanity check to the last moment in doebuild() and only require these variables if an existing environment (such as environment.bz2) is unavailable. * Convert messages about missing portage tree to debug level warnings since quite often it's possible to function without a portage tree now. * Make binarytree.populate() stop relying on having a categories list since it may not be available if there is no portage tree. (trunk r8972:8976) svn path=/main/branches/2.1.2/; revision=8977 --- bin/emerge | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 9cfb9bdb9..195cb44fe 100755 --- a/bin/emerge +++ b/bin/emerge @@ -6184,16 +6184,7 @@ def parse_opts(tmpcmdline, silent=False): return myaction, myopts, myfiles def validate_ebuild_environment(trees): - for myroot in trees: - mysettings = trees[myroot]["vartree"].settings - if not mysettings.get("ARCH", None): - print >> sys.stderr, bad("\a!!! ARCH is not set... " + \ - "Are you missing the '%setc/make.profile' symlink?" % \ - mysettings["PORTAGE_CONFIGROOT"]) - print >> sys.stderr, bad("\a!!! Is the symlink correct? " + \ - "Is your portage tree complete?\n") - sys.exit(9) - del myroot, mysettings + pass def load_emerge_config(trees=None): kwargs = {} -- cgit v1.2.3-1-g7c22