Rename EprefixWithHelpers to NoOffsetWithHelpers

Also check D and ROOT at the same time we check ED, EROOT and EPREFIX
used with helper functions.

diff --git a/bin/repoman b/bin/repoman
index f6e6a11d7fba88e1eb28606023ae72341664e1e8..5fe6e22bc26e43b52962ceef3ae39a8b92b0173b 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -296,7 +296,6 @@ qahelp={
        "inherit.autotools":"Ebuild inherits autotools but does not call eautomake, eautoconf or eautoreconf",
        "inherit.deprecated":"Ebuild inherits a deprecated eclass",
        "java.eclassesnotused":"With virtual/jdk in DEPEND you must inherit a java eclass",
-       "prefix.usedwithhelpers":"Ebuild uses ED, EROOT or EPREFIX with helpers",
        "wxwidgets.eclassnotused":"Ebuild DEPENDs on x11-libs/wxGTK without inheriting wxwidgets.eclass",
        "KEYWORDS.dropped":"Ebuilds that appear to have dropped KEYWORDS for some arch",
        "KEYWORDS.missing":"Ebuilds that have a missing or empty KEYWORDS variable",
@@ -344,6 +343,7 @@ qahelp={
        "ebuild.nesteddie":"Placing 'die' inside ( ) prints an error, but doesn't stop the ebuild.",
        "variable.invalidchar":"A variable contains an invalid character that is not part of the ASCII character set",
        "variable.readonly":"Assigning a readonly variable",
+       "variable.usedwithhelpers":"Ebuild uses D, ROOT, ED, EROOT or EPREFIX with helpers",
        "LIVEVCS.stable":"This ebuild is a live checkout from a VCS but has stable keywords.",
        "LIVEVCS.unmasked":"This ebuild is a live checkout from a VCS but has keywords and is not masked in the global package.mask.",
        "IUSE.invalid":"This ebuild has a variable in IUSE that is not in the use.desc or its metadata.xml file",

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index b980fad4c50c0085fb1691fd3a94593629b330c4..f8254e08f3b2b7988e3f5d37010fd4f0d199ea21 100644 (file)
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -327,11 +327,13 @@ class EprefixifyDefined(LineCheck):
                elif self._inherit_prefix_re.search(line) is not None:
                        self._prefix_inherited = True
 
-class EprefixWithHelpers(LineCheck):
-       """ Check that ED, EROOT and EPREFIX aren't used with helpers """
+class NoOffsetWithHelpers(LineCheck):
+       """ Check that the image location, the alternate root offset, and the
+       offset prefix (D, ROOT, ED, EROOT and EPREFIX) are not used with
+       helpers """
 
-       repoman_check_name = 'prefix.usedwithhelpers'
-       re = re.compile(r'.*\b(dodir|dohard|exeinto|insinto|into)\s+"?\$\{?(ED|EROOT|EPREFIX)\}?.*')
+       repoman_check_name = 'variable.usedwithhelpers'
+       re = re.compile(r'.*\b(dodir|dohard|exeinto|insinto|into)\s+"?\$\{?(D|ROOT|ED|EROOT|EPREFIX)\}?.*')
        error = errors.EPREFIX_WITH_HELPERS
 
 class ImplicitRuntimeDeps(LineCheck):
@@ -629,7 +631,7 @@ _constant_checks = tuple((c() for c in (
        ImplicitRuntimeDeps, InheritAutotools, InheritDeprecated, IUseUndefined,
        EMakeParallelDisabled, EMakeParallelDisabledViaMAKEOPTS, NoAsNeeded,
        DeprecatedBindnowFlags, SrcUnpackPatches, WantAutoDefaultValue,
-       SrcCompileEconf, Eapi3DeprecatedFuncs, EprefixWithHelpers,
+       SrcCompileEconf, Eapi3DeprecatedFuncs, NoOffsetWithHelpers,
        Eapi4IncompatibleFuncs, Eapi4GoneVars, BuiltWithUse,
        PreserveOldLib, SandboxAddpredict)))
 

diff --git a/pym/repoman/errors.py b/pym/repoman/errors.py
index 530b42fc91a3631e395dd18c367d0cdc07154794..f588125efe73a861e5d64913d81a0fe625745c82 100644 (file)
--- a/pym/repoman/errors.py
+++ b/pym/repoman/errors.py
@@ -20,5 +20,5 @@ NO_AS_NEEDED = 'Upstream asneeded linking bug (no-as-needed on line: %d)'
 PRESERVE_OLD_LIB = 'Upstream ABI change workaround on line: %d'
 BUILT_WITH_USE = 'built_with_use on line: %d'
 EPREFIXIFY_MISSING_INHERIT = "prefix.eclass is not inherited, but eprefixify is used on line: %d"
-EPREFIX_WITH_HELPERS = "Helper function is used with ED, EROOT or ERPREFIX on line :%d"
+NO_OFFSET_WITH_HELPERS = "Helper function is used with D, ROOT, ED, EROOT or EPREFIX on line :%d"
 SANDBOX_ADDPREDICT = 'Ebuild calls addpredict on line: %d'