Patchwork [1/1] kernel-yocto: Add a missing '['

login
register
mail settings
Submitter Peter Kjellerstedt
Date Oct. 10, 2013, 8:52 a.m.
Message ID <355273a51c66495b635703627d588940a9c9c7d4.1381395083.git.pkj@axis.com>
Download mbox | patch
Permalink /patch/59595/
State Accepted
Commit 0314b910e9c60f50acb62974a8b13c174fc9877b
Headers show

Comments

Peter Kjellerstedt - Oct. 10, 2013, 8:52 a.m.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Bruce Ashfield - Oct. 11, 2013, 2:31 a.m.
On Thu, Oct 10, 2013 at 4:52 AM, Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>

Ouch. And the worst part is that I've since changed this line in some pre 1.6
work and didn't notice the fat finger slip.

I'd merge this myself, but I'm out of the office, so I'll ack it here,
and RP/Saul
can hopefully pick it up directly.

Bruce

> ---
>  meta/classes/kernel-yocto.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
> index 97a5fa7..8f79932 100644
> --- a/meta/classes/kernel-yocto.bbclass
> +++ b/meta/classes/kernel-yocto.bbclass
> @@ -298,7 +298,7 @@ do_validate_branches() {
>         set +e
>         # if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
>         # check and we can exit early
> -       if [ "${SRCREV_machine}" = "AUTOINC" ] || "${SRCREV_machine}" = "INVALID" ] ||
> +       if [ "${SRCREV_machine}" = "AUTOINC" ] || [ "${SRCREV_machine}" = "INVALID" ] ||
>            [ "${SRCREV_machine}" = "" ]; then
>                 return
>         fi
> --
> 1.8.4
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 97a5fa7..8f79932 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -298,7 +298,7 @@  do_validate_branches() {
 	set +e
 	# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
 	# check and we can exit early
-	if [ "${SRCREV_machine}" = "AUTOINC" ] || "${SRCREV_machine}" = "INVALID" ] ||
+	if [ "${SRCREV_machine}" = "AUTOINC" ] || [ "${SRCREV_machine}" = "INVALID" ] ||
 	   [ "${SRCREV_machine}" = "" ]; then
 		return
 	fi