Patchwork tcf-agent, matchbox-wm-2: Correct "proto=git" to "protocol=git".

login
register
mail settings
Submitter Robert P. J. Day
Date July 7, 2012, 10:54 a.m.
Message ID <alpine.DEB.2.02.1207070649530.18262@oneiric>
Download mbox | patch
Permalink /patch/31359/
State New
Headers show

Comments

Robert P. J. Day - July 7, 2012, 10:54 a.m.
"proto=git" is not a valid parameter for the git fetcher.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

  normally, i wouldn't pick on stuff like this but as i read git.py,
it seems pretty clear that "proto=git" isn't even a valid parameter.
a cleaner solution would be to remove all of that superfluous
"protocol=git" content but i'm not going down that road.
Andrei Gherzan - July 9, 2012, 9:27 a.m.
On Sat, Jul 7, 2012 at 1:54 PM, Robert P. J. Day <rpjday@crashcourse.ca>wrote:

>
> "proto=git" is not a valid parameter for the git fetcher.
>
> NOTE: package
matchbox-wm-2-0.1+git1+01fa5465743c9ee43d040350f4405d35293e4869-r1: task
do_fetch: Succeeded

Anyway, in the git.py, code is searching for "protocol" parameter:
*ud.proto = ud.parm['protocol']*
*
*
... so your change seems legit.

On another hand, svn.py is using:
* proto = ud.parm.get('proto', 'svn')*

A good think would be to use the same parameter names for all protocols.

@g
Richard Purdie - July 9, 2012, 5 p.m.
On Mon, 2012-07-09 at 12:27 +0300, Andrei Gherzan wrote:
> On Sat, Jul 7, 2012 at 1:54 PM, Robert P. J. Day
> <rpjday@crashcourse.ca> wrote:
>
>         "proto=git" is not a valid parameter for the git fetcher.
>
> NOTE: package matchbox-wm-2-0.1+git1
> +01fa5465743c9ee43d040350f4405d35293e4869-r1: task do_fetch:
> Succeeded 
>
> Anyway, in the git.py, code is searching for "protocol" parameter:
> ud.proto = ud.parm['protocol']
>
> ... so your change seems legit. 
>
> On another hand, svn.py is using:
>  proto = ud.parm.get('proto', 'svn')
>
> A good think would be to use the same parameter names for all
> protocols. 
> 
I agree but how do we do this without breaking the world? We probably
should try and standardise it, probably to "protocol".

Cheers,

Richard
Khem Raj - July 9, 2012, 5:40 p.m.
On Mon, Jul 9, 2012 at 10:00 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Mon, 2012-07-09 at 12:27 +0300, Andrei Gherzan wrote:
>> On Sat, Jul 7, 2012 at 1:54 PM, Robert P. J. Day
>> <rpjday@crashcourse.ca> wrote:
>>
>>         "proto=git" is not a valid parameter for the git fetcher.
>>
>> NOTE: package matchbox-wm-2-0.1+git1
>> +01fa5465743c9ee43d040350f4405d35293e4869-r1: task do_fetch:
>> Succeeded
>>
>> Anyway, in the git.py, code is searching for "protocol" parameter:
>> ud.proto = ud.parm['protocol']
>>
>> ... so your change seems legit.
>>
>> On another hand, svn.py is using:
>>  proto = ud.parm.get('proto', 'svn')
>>
>> A good think would be to use the same parameter names for all
>> protocols.
>>
> I agree but how do we do this without breaking the world? We probably
> should try and standardise it, probably to "protocol".

so may be change the keyword to protocol and have both for this
release additionally give a deprecation warning on proto and then
after 1.3 remove proto
Andrei Gherzan - July 9, 2012, 8:22 p.m.
On Mon, Jul 9, 2012 at 8:40 PM, Khem Raj <raj.khem@gmail.com> wrote:

> On Mon, Jul 9, 2012 at 10:00 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Mon, 2012-07-09 at 12:27 +0300, Andrei Gherzan wrote:
> >> On Sat, Jul 7, 2012 at 1:54 PM, Robert P. J. Day
> >> <rpjday@crashcourse.ca> wrote:
> >>
> >>         "proto=git" is not a valid parameter for the git fetcher.
> >>
> >> NOTE: package matchbox-wm-2-0.1+git1
> >> +01fa5465743c9ee43d040350f4405d35293e4869-r1: task do_fetch:
> >> Succeeded
> >>
> >> Anyway, in the git.py, code is searching for "protocol" parameter:
> >> ud.proto = ud.parm['protocol']
> >>
> >> ... so your change seems legit.
> >>
> >> On another hand, svn.py is using:
> >>  proto = ud.parm.get('proto', 'svn')
> >>
> >> A good think would be to use the same parameter names for all
> >> protocols.
> >>
> > I agree but how do we do this without breaking the world? We probably
> > should try and standardise it, probably to "protocol".
>
> so may be change the keyword to protocol and have both for this
> release additionally give a deprecation warning on proto and then
> after 1.3 remove proto
>

Healthy approach. I can submit patches on this topic if nobody did it
already locally.

@g
Robert P. J. Day - July 9, 2012, 9:08 p.m.
On Mon, 9 Jul 2012, Andrei Gherzan wrote:

> On Mon, Jul 9, 2012 at 8:40 PM, Khem Raj <raj.khem@gmail.com> wrote:
>       On Mon, Jul 9, 2012 at 10:00 AM, Richard Purdie
>       <richard.purdie@linuxfoundation.org> wrote:
>       > On Mon, 2012-07-09 at 12:27 +0300, Andrei Gherzan wrote:
>       >> On Sat, Jul 7, 2012 at 1:54 PM, Robert P. J. Day
>       >> <rpjday@crashcourse.ca> wrote:
>       >>
>       >>         "proto=git" is not a valid parameter for the git fetcher.
>       >>
>       >> NOTE: package matchbox-wm-2-0.1+git1
>       >> +01fa5465743c9ee43d040350f4405d35293e4869-r1: task do_fetch:
>       >> Succeeded
>       >>
>       >> Anyway, in the git.py, code is searching for "protocol" parameter:
>       >> ud.proto = ud.parm['protocol']
>       >>
>       >> ... so your change seems legit.
>       >>
>       >> On another hand, svn.py is using:
>       >>  proto = ud.parm.get('proto', 'svn')
>       >>
>       >> A good think would be to use the same parameter names for all
>       >> protocols.
>       >>
>       > I agree but how do we do this without breaking the world? We probably
>       > should try and standardise it, probably to "protocol".
>
> so may be change the keyword to protocol and have both for this
> release additionally give a deprecation warning on proto and then
> after 1.3 remove proto
>
> Healthy approach. I can submit patches on this topic if nobody did
> it already locally. 

 i can see my work here is done.  i will go find something else to
complain about.  :-)

rday
Khem Raj - July 9, 2012, 10:12 p.m.
> Healthy approach. I can submit patches on this topic if nobody did it
> already locally.

please do.

Patch

diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
index 8ac8022..25fccaf 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
@@ -10,7 +10,7 @@  SRCREV = "4ef94ecb927a8912c3d79ce137182247786cff8f"
 PV = "0.4.0+git${SRCPV}"
 PR = "r0"

-SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;proto=git \
+SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;protocol=git \
            http://www.eclipse.org/legal/epl-v10.html;name=epl \
            file://fix_ranlib.patch \
            file://fix_tcf-agent.init.patch \
diff --git a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
index 4aad3a9..8b162be 100644
--- a/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
+++ b/meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_git.bb
@@ -9,7 +9,7 @@  SRCREV = "01fa5465743c9ee43d040350f4405d35293e4869"
 PV = "0.1+git${SRCPV}"
 PR = "r1"

-SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;proto=git \
+SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager-2;protocol=git \
 	file://fix_makefile.patch \
 	  "