From 49f2974e15f7e37dde4cfbcef84abf14e6dd4e4a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 21 Dec 2010 08:29:39 -0800 Subject: doebuild: fix bug #349273 Since commit 75d3130fc8293fff68389b8fed44b8d47a0abe80, doebuild() for the 'setup' phase triggers the actionmap_deps code path in order to call the 'pretend' phase as a dependency. This path previously assumed a portdbapi instance, which may not hold for some api consumers such as entropy. Therefore, fix the code path to work with other dbapi types. --- bin/ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/ebuild b/bin/ebuild index f7008b1b5..b57215fa7 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -241,7 +241,7 @@ build_dir_phases = set(["setup", "unpack", "prepare", "configure", "compile", # If the current metadata is invalid then force the ebuild to be # sourced again even if $T/environment already exists. ebuild_changed = False -if build_dir_phases.intersection(pargs): +if mytree == "porttree" and build_dir_phases.intersection(pargs): metadata, st, emtime = \ portage.portdb._pull_valid_cache(cpv, ebuild, ebuild_portdir) if metadata is None: -- cgit v1.2.3-1-g7c22