[PATCH 0/5] Modify fetchers to warn user if "param" is used

[PATCH 0/5] Modify fetchers to warn user if "param" is used

[Andrei Gherzan]

Andrei Gherzan (5):
  fetch2/bzr.py: Use "protocol" parameter and warn user if recipe is
    using "proto"
  fetch2/git.py: Use "protocol" parameter and warn user if recipe is
    using "proto"
  fetch2/hg.py: Use "protocol" parameter and warn user if recipe is
    using "proto"
  fetch2/osc.py: Use "protocol" parameter and warn user if recipe is
    using "proto"
  fetch2/svn.py: Use "protocol" parameter and warn user if recipe is
    using "proto"

 bitbake/lib/bb/fetch2/bzr.py |    7 ++++++-
 bitbake/lib/bb/fetch2/git.py |    4 ++++
 bitbake/lib/bb/fetch2/hg.py  |    7 ++++++-
 bitbake/lib/bb/fetch2/osc.py |    7 ++++++-
 bitbake/lib/bb/fetch2/svn.py |    7 ++++++-
 5 files changed, 28 insertions(+), 4 deletions(-)

-- 
1.7.9.5

[PATCH 1/5] fetch2/bzr.py: Use "protocol" parameter and warn user if recipe is using "proto"

[Andrei Gherzan]

If SRC_URI uses the parameter "proto" while specifying the protocol, use this
value but warn the user about this problem.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 bitbake/lib/bb/fetch2/bzr.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py
index 0d10eb4..e27c70e 100644
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/bitbake/lib/bb/fetch2/bzr.py
@@ -60,7 +60,12 @@ class Bzr(FetchMethod):
 
         basecmd = data.expand('${FETCHCMD_bzr}', d)
 
-        proto =  ud.parm.get('proto', 'http')
+        proto =  ud.parm.get('protocol', 'http')
+
+        if ud.parm.get('proto') is not None:
+            logger.warn('Update %s recipe to use "protocol" not "proto".', d.getVar('PN', True))
+            # Use proto value for now
+            proto =  ud.parm.get('proto')
 
         bzrroot = ud.host + ud.path
 
-- 
1.7.9.5

[PATCH 2/5] fetch2/git.py: Use "protocol" parameter and warn user if recipe is using "proto"

[Andrei Gherzan]

If SRC_URI uses the parameter "proto" while specifying the protocol, use this
value but warn the user about this problem.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 bitbake/lib/bb/fetch2/git.py |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 384007c..354f3b1 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -92,6 +92,10 @@ class Git(FetchMethod):
         """
         if 'protocol' in ud.parm:
             ud.proto = ud.parm['protocol']
+        elif 'proto' in ud.parm:
+            logger.warn('Update %s recipe to use "protocol" not "proto".', d.getVar('PN', True))
+            # Use proto value for now
+            ud.proto = ud.parm['proto']
         elif not ud.host:
             ud.proto = 'file'
         else:
-- 
1.7.9.5

[PATCH 3/5] fetch2/hg.py: Use "protocol" parameter and warn user if recipe is using "proto"

[Andrei Gherzan]

If SRC_URI uses the parameter "proto" while specifying the protocol, use this
value but warn the user about this problem.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 bitbake/lib/bb/fetch2/hg.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py
index ad6e85d..31ba1cf 100644
--- a/bitbake/lib/bb/fetch2/hg.py
+++ b/bitbake/lib/bb/fetch2/hg.py
@@ -82,7 +82,12 @@ class Hg(FetchMethod):
 
         basecmd = data.expand('${FETCHCMD_hg}', d)
 
-        proto = ud.parm.get('proto', 'http')
+        proto = ud.parm.get('protocol', 'http')
+
+        if ud.parm.get('proto') is not None:
+            logger.warn('Update %s recipe to use "protocol" not "proto".', d.getVar('PN', True))
+            # Use proto value for now
+            proto =  ud.parm.get('proto')
 
         host = ud.host
         if proto == "file":
-- 
1.7.9.5

[PATCH 4/5] fetch2/osc.py: Use "protocol" parameter and warn user if recipe is using "proto"

[Andrei Gherzan]

If SRC_URI uses the parameter "proto" while specifying the protocol, use this
value but warn the user about this problem.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 bitbake/lib/bb/fetch2/osc.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py
index a16a53e..5506829 100644
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -57,7 +57,12 @@ class Osc(FetchMethod):
 
         basecmd = data.expand('${FETCHCMD_osc}', d)
 
-        proto = ud.parm.get('proto', 'ocs')
+        proto = ud.parm.get('protocol', 'ocs')
+
+        if ud.parm.get('proto') is not None:
+            logger.warn('Update %s recipe to use "protocol" not "proto".', d.getVar('PN', True))
+            # Use proto value for now
+            proto =  ud.parm.get('proto')
 
         options = []
 
-- 
1.7.9.5

[PATCH 5/5] fetch2/svn.py: Use "protocol" parameter and warn user if recipe is using "proto"

[Andrei Gherzan]

If SRC_URI uses the parameter "proto" while specifying the protocol, use this
value but warn the user about this problem.

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 bitbake/lib/bb/fetch2/svn.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index bc5b96b..48adce8 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -71,7 +71,12 @@ class Svn(FetchMethod):
         command is "fetch", "update", "info"
         """
 
-        proto = ud.parm.get('proto', 'svn')
+        proto = ud.parm.get('protocol', 'svn')
+
+        if ud.parm.get('proto') is not None:
+            logger.warn('Update %s recipe to use "protocol" not "proto".', d.getVar('PN', True))
+            # Use proto value for now
+            proto =  ud.parm.get('proto')
 
         svn_rsh = None
         if proto == "svn+ssh" and "rsh" in ud.parm:
-- 
1.7.9.5

Re: [PATCH 0/5] Modify fetchers to warn user if "param" is used

[Richard Purdie]

On Tue, 2012-07-10 at 14:15 +0300, Andrei Gherzan wrote:
> Andrei Gherzan (5):
>   fetch2/bzr.py: Use "protocol" parameter and warn user if recipe is
>     using "proto"
>   fetch2/git.py: Use "protocol" parameter and warn user if recipe is
>     using "proto"
>   fetch2/hg.py: Use "protocol" parameter and warn user if recipe is
>     using "proto"
>   fetch2/osc.py: Use "protocol" parameter and warn user if recipe is
>     using "proto"
>   fetch2/svn.py: Use "protocol" parameter and warn user if recipe is
>     using "proto"
> 
>  bitbake/lib/bb/fetch2/bzr.py |    7 ++++++-
>  bitbake/lib/bb/fetch2/git.py |    4 ++++
>  bitbake/lib/bb/fetch2/hg.py  |    7 ++++++-
>  bitbake/lib/bb/fetch2/osc.py |    7 ++++++-
>  bitbake/lib/bb/fetch2/svn.py |    7 ++++++-
>  5 files changed, 28 insertions(+), 4 deletions(-)

How about putting this check into __init__.py and then just setting the
protocol parameter instead if its used? We can then change the backends
just to use procotol right now.

Cheers,

Richard

Re: [PATCH 0/5] Modify fetchers to warn user if "param" is used

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]

On Tue, Jul 10, 2012 at 4:33 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Tue, 2012-07-10 at 14:15 +0300, Andrei Gherzan wrote:
> > Andrei Gherzan (5):
> >   fetch2/bzr.py: Use "protocol" parameter and warn user if recipe is
> >     using "proto"
> >   fetch2/git.py: Use "protocol" parameter and warn user if recipe is
> >     using "proto"
> >   fetch2/hg.py: Use "protocol" parameter and warn user if recipe is
> >     using "proto"
> >   fetch2/osc.py: Use "protocol" parameter and warn user if recipe is
> >     using "proto"
> >   fetch2/svn.py: Use "protocol" parameter and warn user if recipe is
> >     using "proto"
> >
> >  bitbake/lib/bb/fetch2/bzr.py |    7 ++++++-
> >  bitbake/lib/bb/fetch2/git.py |    4 ++++
> >  bitbake/lib/bb/fetch2/hg.py  |    7 ++++++-
> >  bitbake/lib/bb/fetch2/osc.py |    7 ++++++-
> >  bitbake/lib/bb/fetch2/svn.py |    7 ++++++-
> >  5 files changed, 28 insertions(+), 4 deletions(-)
>
> How about putting this check into __init__.py and then just setting the
> protocol parameter instead if its used? We can then change the backends
> just to use procotol right now.
>
>
I can add the warning in init but how would i define the local proto value
to the one defined with parameter "proto"?

@g

[-- Attachment #2: Type: text/html, Size: 1799 bytes --]

Re: [PATCH 0/5] Modify fetchers to warn user if "param" is used

[Richard Purdie]

On Tue, 2012-07-10 at 18:04 +0300, Andrei Gherzan wrote:
> On Tue, Jul 10, 2012 at 4:33 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>         On Tue, 2012-07-10 at 14:15 +0300, Andrei Gherzan wrote:
>         > Andrei Gherzan (5):
>         >   fetch2/bzr.py: Use "protocol" parameter and warn user if
>         recipe is
>         >     using "proto"
>         >   fetch2/git.py: Use "protocol" parameter and warn user if
>         recipe is
>         >     using "proto"
>         >   fetch2/hg.py: Use "protocol" parameter and warn user if
>         recipe is
>         >     using "proto"
>         >   fetch2/osc.py: Use "protocol" parameter and warn user if
>         recipe is
>         >     using "proto"
>         >   fetch2/svn.py: Use "protocol" parameter and warn user if
>         recipe is
>         >     using "proto"
>         >
>         >  bitbake/lib/bb/fetch2/bzr.py |    7 ++++++-
>         >  bitbake/lib/bb/fetch2/git.py |    4 ++++
>         >  bitbake/lib/bb/fetch2/hg.py  |    7 ++++++-
>         >  bitbake/lib/bb/fetch2/osc.py |    7 ++++++-
>         >  bitbake/lib/bb/fetch2/svn.py |    7 ++++++-
>         >  5 files changed, 28 insertions(+), 4 deletions(-)
>         
>         How about putting this check into __init__.py and then just
>         setting the
>         protocol parameter instead if its used? We can then change the
>         backends
>         just to use procotol right now.
>         
>  
> I can add the warning in init but how would i define the local proto
> value to the one defined with parameter "proto"? 

In FetchData::__init__(), add 

        proto = self.parm.get("proto", None)
        if proto and "protocol" not in self.param:
            self.parm["protocol"] = proto

before urldata_init?

Cheers,

Richard

Re: [PATCH 0/5] Modify fetchers to warn user if "param" is used

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]

On Tue, Jul 10, 2012 at 7:08 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Tue, 2012-07-10 at 18:04 +0300, Andrei Gherzan wrote:
> > On Tue, Jul 10, 2012 at 4:33 PM, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >         On Tue, 2012-07-10 at 14:15 +0300, Andrei Gherzan wrote:
> >         > Andrei Gherzan (5):
> >         >   fetch2/bzr.py: Use "protocol" parameter and warn user if
> >         recipe is
> >         >     using "proto"
> >         >   fetch2/git.py: Use "protocol" parameter and warn user if
> >         recipe is
> >         >     using "proto"
> >         >   fetch2/hg.py: Use "protocol" parameter and warn user if
> >         recipe is
> >         >     using "proto"
> >         >   fetch2/osc.py: Use "protocol" parameter and warn user if
> >         recipe is
> >         >     using "proto"
> >         >   fetch2/svn.py: Use "protocol" parameter and warn user if
> >         recipe is
> >         >     using "proto"
> >         >
> >         >  bitbake/lib/bb/fetch2/bzr.py |    7 ++++++-
> >         >  bitbake/lib/bb/fetch2/git.py |    4 ++++
> >         >  bitbake/lib/bb/fetch2/hg.py  |    7 ++++++-
> >         >  bitbake/lib/bb/fetch2/osc.py |    7 ++++++-
> >         >  bitbake/lib/bb/fetch2/svn.py |    7 ++++++-
> >         >  5 files changed, 28 insertions(+), 4 deletions(-)
> >
> >         How about putting this check into __init__.py and then just
> >         setting the
> >         protocol parameter instead if its used? We can then change the
> >         backends
> >         just to use procotol right now.
> >
> >
> > I can add the warning in init but how would i define the local proto
> > value to the one defined with parameter "proto"?
>
> In FetchData::__init__(), add
>
>         proto = self.parm.get("proto", None)
>         if proto and "protocol" not in self.param:
>             self.parm["protocol"] = proto
>
> before urldata_init?
>
> Yes. It makes sense this way. V2 is on it's way.

@g

[-- Attachment #2: Type: text/html, Size: 2842 bytes --]