Patchwork [bitbake-devel,1/5] fetch2/bzr.py: Use "protocol" parameter and warn user if recipe is using "proto"

login
register
mail settings
Submitter Andrei Gherzan
Date July 10, 2012, 11:16 a.m.
Message ID <04cbd60330fb7ae53d40956fa06feee67bc9e1cb.1341918809.git.andrei@gherzan.ro>
Download mbox | patch
Permalink /patch/31609/
State New
Headers show

Comments

Andrei Gherzan - July 10, 2012, 11:16 a.m.
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(-)

Patch

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