From f9821525540f6ce0e47d2cfcc0454a1ff9c6dba5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 20 Feb 2007 21:49:14 +0000 Subject: For bug #167795, try avoid the population routine when possible, so that FEATURES=buildpkg doesn't always force population. (trunk r6018:6019) svn path=/main/branches/2.1.2/; revision=6020 --- pym/portage.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index fadc9cec5..90d18ca38 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6434,6 +6434,17 @@ class binarytree(object): use for a given cpv. If a collision will occur with an existing package from another category, the existing package will be bumped to ${PKGDIR}/${CATEGORY}/${PF}.tbz2 so that both can coexist.""" + if not self.populated: + # Try to avoid the population routine when possible, so that + # FEATURES=buildpkg doesn't always force population. + mycat, mypkg = catsplit(cpv) + myfile = mypkg + ".tbz2" + full_path = os.path.join(self.pkgdir, "All", myfile) + if not os.path.exists(full_path): + return + tbz2_cat = xpak.tbz2(full_path).getfile("CATEGORY") + if tbz2_cat and tbz2_cat.strip() == mycat: + return full_path = self.getname(cpv) if "All" == full_path.split(os.path.sep)[-2]: return -- cgit v1.2.3-1-g7c22