patch.bbclass: Finally remove support for deprecated "pnum=".

Submitted by Robert P. J. Day on Dec. 13, 2012, 1:25 a.m.

Details

Message ID alpine.DEB.2.02.1212122024470.1116@oneiric
State New
Headers show

Commit Message

Robert P. J. Day Dec. 13, 2012, 1:25 a.m.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

  someone else is welcome to apply this if it seems appropriate.

Patch hide | download patch | download mbox

diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index ed12802..31f76f6 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -33,9 +33,6 @@  def src_patches(d, all = False ):
         patchparm = {'patchname': patchname}
         if "striplevel" in parm:
             striplevel = parm["striplevel"]
-        elif "pnum" in parm:
-            #bb.msg.warn(None, "Deprecated usage of 'pnum' url parameter in '%s', please use 'striplevel'" % url)
-            striplevel = parm["pnum"]
         else:
             striplevel = '1'
         patchparm['striplevel'] = striplevel

Comments

Tomas Frydrych Dec. 13, 2012, 8:10 a.m.
On 13/12/12 01:25, Robert P. J. Day wrote:
> -        elif "pnum" in parm:
> -            #bb.msg.warn(None, "Deprecated usage of 'pnum' url parameter in '%s', please use 'striplevel'" % url)
> -            striplevel = parm["pnum"]

Not sure what the rationale is for needing to remove it at all, but if
you do, it should error on pnum use, so that folk who might have any
custom recipes using it get a clear error message, rather than letting
it fail inside the patch task.

Tomas
Paul Eggleton Dec. 13, 2012, 9:32 a.m.
On Wednesday 12 December 2012 20:25:50 Robert P. J. Day wrote:
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> 
> ---
> 
>   someone else is welcome to apply this if it seems appropriate.
> 
> diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
> index ed12802..31f76f6 100644
> --- a/meta/classes/patch.bbclass
> +++ b/meta/classes/patch.bbclass
> @@ -33,9 +33,6 @@ def src_patches(d, all = False ):
>          patchparm = {'patchname': patchname}
>          if "striplevel" in parm:
>              striplevel = parm["striplevel"]
> -        elif "pnum" in parm:
> -            #bb.msg.warn(None, "Deprecated usage of 'pnum' url parameter in
> '%s', please use 'striplevel'" % url) -            striplevel =
> parm["pnum"]
>          else:
>              striplevel = '1'
>          patchparm['striplevel'] = striplevel

I'm not sure I see a pressing need to remove this support, but I am puzzled as 
to why the "deprecated" message is commented out - that should definitely be 
fixed if nothing else.

Cheers,
Paul
Robert P. J. Day Dec. 13, 2012, 12:05 p.m.
On Thu, 13 Dec 2012, Paul Eggleton wrote:

> On Wednesday 12 December 2012 20:25:50 Robert P. J. Day wrote:
> > Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
> >
> > ---
> >
> >   someone else is welcome to apply this if it seems appropriate.
> >
> > diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
> > index ed12802..31f76f6 100644
> > --- a/meta/classes/patch.bbclass
> > +++ b/meta/classes/patch.bbclass
> > @@ -33,9 +33,6 @@ def src_patches(d, all = False ):
> >          patchparm = {'patchname': patchname}
> >          if "striplevel" in parm:
> >              striplevel = parm["striplevel"]
> > -        elif "pnum" in parm:
> > -            #bb.msg.warn(None, "Deprecated usage of 'pnum' url parameter in
> > '%s', please use 'striplevel'" % url) -            striplevel =
> > parm["pnum"]
> >          else:
> >              striplevel = '1'
> >          patchparm['striplevel'] = striplevel
>
> I'm not sure I see a pressing need to remove this support, but I am
> puzzled as to why the "deprecated" message is commented out - that
> should definitely be fixed if nothing else.

  i believe i'll leave this decision in the hands of someone higher up
the food chain.  i will only observe that, with the exception of that
parameter in a single recipe i'm about to send in a patch for, i'm not
aware of it anywhere else.

rday