Permalink
Browse files

Portage dynamic SLOT. Ebuilds can now set their own SLOT value. This …

…is useful for custom kernel ebuilds.
  • Loading branch information...
1 parent e87e238 commit 537e239c610b3af5d2c860f27018cf7934fb6e00 @danielrobbins danielrobbins committed Sep 25, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 bin/phase-functions.sh
  2. +1 −1 pym/portage/dbapi/vartree.py
View
2 bin/phase-functions.sh
@@ -9,7 +9,7 @@
PORTAGE_READONLY_METADATA="DEFINED_PHASES DEPEND DESCRIPTION
EAPI HOMEPAGE INHERITED IUSE REQUIRED_USE KEYWORDS LICENSE
- PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
+ PDEPEND PROVIDE RDEPEND RESTRICT SRC_URI"
PORTAGE_READONLY_VARS="D EBUILD EBUILD_PHASE \
EBUILD_SH_ARGS ECLASSDIR EMERGE_FROM FILESDIR MERGE_TYPE \
View
2 pym/portage/dbapi/vartree.py
@@ -3225,7 +3225,7 @@ def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=0,
return 1
write_atomic(os.path.join(inforoot, var_name), slot + '\n')
- if val != self.settings.get(var_name, ''):
+ if var_name != "SLOT" and val != self.settings.get(var_name, ''):
self._eqawarn('preinst',
[_("QA Notice: Expected %(var_name)s='%(expected_value)s', got '%(actual_value)s'\n") % \
{"var_name":var_name, "expected_value":self.settings.get(var_name, ''), "actual_value":val}])

0 comments on commit 537e239

Please sign in to comment.