summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-13 06:32:17 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-13 06:32:17 +0000
commitcedad8d6c28b28ca3da940db8a66e150a9f939e3 (patch)
treec60e425bb431781e10884c9ec1fcad226ac9c162
parent7deee1551ab2bfdabdadde71a8494b3710f689f3 (diff)
downloadportage-cedad8d6c28b28ca3da940db8a66e150a9f939e3.tar.gz
portage-cedad8d6c28b28ca3da940db8a66e150a9f939e3.tar.bz2
portage-cedad8d6c28b28ca3da940db8a66e150a9f939e3.zip
Bug #201848 - Make the ebuild command reject ebuilds that do not define
SLOT. (trunk r8895) svn path=/main/branches/2.1.2/; revision=8902
-rw-r--r--pym/portage.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 07a01d7c3..9cf99b196 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4319,7 +4319,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
mycpv = mysettings["CATEGORY"] + "/" + mysettings["PF"]
dep_keys = ["DEPEND", "RDEPEND", "PDEPEND"]
misc_keys = ["LICENSE", "PROVIDE", "RESTRICT", "SRC_URI"]
- all_keys = dep_keys + misc_keys
+ other_keys = ["SLOT"]
+ all_keys = dep_keys + misc_keys + other_keys
metadata = dict(izip(all_keys, mydbapi.aux_get(mycpv, all_keys)))
class FakeTree(object):
def __init__(self, mydb):
@@ -4347,6 +4348,10 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
if mydo not in invalid_dep_exempt_phases:
return 1
del k
+ if not metadata["SLOT"]:
+ writemsg("SLOT is undefined\n", noiselevel=-1)
+ if mydo not in invalid_dep_exempt_phases:
+ return 1
del mycpv, dep_keys, metadata, misc_keys, FakeTree, dep_check_trees
if "PORTAGE_TMPDIR" not in mysettings or \