base: Make PRINC warning an error

PATCH In review Richard Purdie 2 participants 2 messages Nov 5, 2014

Share & tools

Richard Purdie

author

2014-11-05 18:43 UTC #0 lore raw

PATCH 1/1 base: Make PRINC warning an error

Apparently 1.5 years of warnings isn't enough to get anyone to take any notice. We therefore make this an error so people can ignore it for another 6 months whereafter we can finally give up and remove the obsolete code.

Signed-off-by Richard Purdie <[email protected]>

meta/classes/base.bbclass +1 -1

index e1b25ff..f5b216b 100644
@@ -375,7 +375,7 @@ python () {
     # obsolete.  Return a warning to the user.
     princ = d.getVar('PRINC', True)
     if princ and princ != "0":
-        bb.warn("Use of PRINC %s was detected in the recipe %s (or one of its .bbappends)\nUse of PRINC is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service." % (princ, d.getVar("FILE", True)))
+        bb.error("Use of PRINC %s was detected in the recipe %s (or one of its .bbappends)\nUse of PRINC is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service." % (princ, d.getVar("FILE", True)))
         pr = d.getVar('PR', True)
         pr_prefix = re.search("\D+",pr)
         prval = re.search("\d+",pr)

Mark Hatle

2014-11-05 19:18 UTC #1 lore raw

Quoted 14 lines · Richard Purdie

Apparently 1.5 years of warnings isn't enough to get anyone to take any notice. We therefore make this an error so people can ignore it for another 6 months whereafter we can finally give up and remove the obsolete code.
Signed-off-by Richard Purdie <[email protected]>
meta/classes/base.bbclass +0 -0
index e1b25ff..f5b216b 100644

meta/classes/base.bbclass python () { · line 381

Quoted 8 lines

meta/classes/base.bbclass +1 -1

@@ -375,7 +375,7 @@ python () {
      # obsolete.  Return a warning to the user.
      princ = d.getVar('PRINC', True)
      if princ and princ != "0":
-        bb.warn("Use of PRINC %s was detected in the recipe %s (or one of its .bbappends)\nUse of PRINC is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service." % (princ, d.getVar("FILE", True)))
+        bb.error("Use of PRINC %s was detected in the recipe %s (or one of its .bbappends)\nUse of PRINC is deprecated.  The PR server should be used to automatically increment the PR.  See: https://wiki.yoctoproject.org/wiki/PR_Service." % (princ, d.getVar("FILE", True)))
          pr = d.getVar('PR', True)
          pr_prefix = re.search("\D+",pr)
          prval = re.search("\d+",pr)

I'd suggest removing the code -after- the bb.error as well..

Make it an error.. and remove the functionality so it's -clear- you can't just make it a warning again.

--Mark