summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-13 04:30:46 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-13 04:30:46 +0000
commit4f48b4a676e7963ba26dd949d420fb8c9daa46d6 (patch)
treea9a143d9785d02682e497299fd2f41550280ae5f
parenta0c901632e9dfe6cbcdfca4f3a8182f5e0a75ad9 (diff)
downloadportage-4f48b4a676e7963ba26dd949d420fb8c9daa46d6.tar.gz
portage-4f48b4a676e7963ba26dd949d420fb8c9daa46d6.tar.bz2
portage-4f48b4a676e7963ba26dd949d420fb8c9daa46d6.zip
Bug #201848 - Make the ebuild command reject ebuilds that do not define
SLOT. svn path=/main/trunk/; revision=8895
-rw-r--r--pym/portage/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index e32e16839..f3da78877 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4339,7 +4339,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):
@@ -4367,6 +4368,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 \