[PATCH-V2 0/5] Warn user if "param" is used in SRC_URI

[PATCH-V2 0/5] Warn user if "param" is used in SRC_URI

[Andrei Gherzan]

The following changes since commit 90ad663909c0c8a405b22a510c9f957007d02669:

  upstream_tracking: update boost (2012-07-09 17:21:38 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ag/protocol
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ag/protocol

Andrei Gherzan (5):
  fetch2/svn.py: Use "protocol" parameter to get the protocol
  fetch2/osc.py: Use "protocol" parameter to get the protocol
  fetch2/hg.py: Use "protocol" parameter to get the protocol
  fetch2/bzr.py: Use "protocol" parameter to get the protocol
  fetch2/__init__.py: Warn user if SRC_URI is using "proto" and not
    "protocol"

 bitbake/lib/bb/fetch2/__init__.py |    4 ++++
 bitbake/lib/bb/fetch2/bzr.py      |    2 +-
 bitbake/lib/bb/fetch2/hg.py       |    2 +-
 bitbake/lib/bb/fetch2/osc.py      |    2 +-
 bitbake/lib/bb/fetch2/svn.py      |    2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

-- 
1.7.9.5

[PATCH-V2 1/5] fetch2/svn.py: Use "protocol" parameter to get the protocol

[Andrei Gherzan]

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

diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py
index bc5b96b..ea5902e 100644
--- a/bitbake/lib/bb/fetch2/svn.py
+++ b/bitbake/lib/bb/fetch2/svn.py
@@ -71,7 +71,7 @@ class Svn(FetchMethod):
         command is "fetch", "update", "info"
         """
 
-        proto = ud.parm.get('proto', 'svn')
+        proto = ud.parm.get('protocol', 'svn')
 
         svn_rsh = None
         if proto == "svn+ssh" and "rsh" in ud.parm:
-- 
1.7.9.5

[PATCH-V2 2/5] fetch2/osc.py: Use "protocol" parameter to get the protocol

[Andrei Gherzan]

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

diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py
index a16a53e..1a3a7bb 100644
--- a/bitbake/lib/bb/fetch2/osc.py
+++ b/bitbake/lib/bb/fetch2/osc.py
@@ -57,7 +57,7 @@ class Osc(FetchMethod):
 
         basecmd = data.expand('${FETCHCMD_osc}', d)
 
-        proto = ud.parm.get('proto', 'ocs')
+        proto = ud.parm.get('protocol', 'ocs')
 
         options = []
 
-- 
1.7.9.5

[PATCH-V2 3/5] fetch2/hg.py: Use "protocol" parameter to get the protocol

[Andrei Gherzan]

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

diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py
index ad6e85d..155ae67 100644
--- a/bitbake/lib/bb/fetch2/hg.py
+++ b/bitbake/lib/bb/fetch2/hg.py
@@ -82,7 +82,7 @@ class Hg(FetchMethod):
 
         basecmd = data.expand('${FETCHCMD_hg}', d)
 
-        proto = ud.parm.get('proto', 'http')
+        proto = ud.parm.get('protocol', 'http')
 
         host = ud.host
         if proto == "file":
-- 
1.7.9.5

[PATCH-V2 4/5] fetch2/bzr.py: Use "protocol" parameter to get the protocol

[Andrei Gherzan]

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

diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py
index 0d10eb4..97daa62 100644
--- a/bitbake/lib/bb/fetch2/bzr.py
+++ b/bitbake/lib/bb/fetch2/bzr.py
@@ -60,7 +60,7 @@ class Bzr(FetchMethod):
 
         basecmd = data.expand('${FETCHCMD_bzr}', d)
 
-        proto =  ud.parm.get('proto', 'http')
+        proto =  ud.parm.get('protocol', 'http')
 
         bzrroot = ud.host + ud.path
 
-- 
1.7.9.5

[PATCH-V2 5/5] fetch2/__init__.py: Warn user if SRC_URI is using "proto" and not "protocol"

[Andrei Gherzan]

As well, if "proto" is used, get the associated value as "protocol"

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

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 52e12a0..fa963be 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -755,6 +755,10 @@ class FetchData(object):
         if localonly and not isinstance(self.method, local.Local):
             raise NonLocalMethod()
 
+        if self.parm.get("proto", None) and "protocol" not in self.parm:
+            logger.warn('Consider updating %s recipe to use "protocol" not "proto" in SRC_URI.', d.getVar('PN', True))
+            self.parm["protocol"] = self.parm.get("proto", None)
+
         if hasattr(self.method, "urldata_init"):
             self.method.urldata_init(self, d)
 
-- 
1.7.9.5

Re: [PATCH-V2 0/5] Warn user if "param" is used in SRC_URI

[Richard Purdie]

On Wed, 2012-07-11 at 00:34 +0300, Andrei Gherzan wrote:
> The following changes since commit 90ad663909c0c8a405b22a510c9f957007d02669:
> 
>   upstream_tracking: update boost (2012-07-09 17:21:38 +0100)
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib ag/protocol
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ag/protocol
> 
> Andrei Gherzan (5):
>   fetch2/svn.py: Use "protocol" parameter to get the protocol
>   fetch2/osc.py: Use "protocol" parameter to get the protocol
>   fetch2/hg.py: Use "protocol" parameter to get the protocol
>   fetch2/bzr.py: Use "protocol" parameter to get the protocol
>   fetch2/__init__.py: Warn user if SRC_URI is using "proto" and not
>     "protocol"

Merged to master, thanks.

Richard