From patchwork Tue Jul 10 11:16:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 4/5] fetch2/osc.py: Use "protocol" parameter and warn user if recipe is using "proto" Date: Tue, 10 Jul 2012 11:16:47 -0000 From: Andrei Gherzan X-Patchwork-Id: 31615 Message-Id: <092593c08bbfdeb46f6bfe9caa80e977364600b6.1341918809.git.andrei@gherzan.ro> To: bitbake-devel@lists.openembedded.org 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 --- 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 = []