[PATCH] os-release: put double-quotes around variable contents

[PATCH] os-release: put double-quotes around variable contents

[Craig McQueen]

This makes the resulting /etc/os-release file have valid shell
assignment syntax. This makes it loadable by a shell script, using the
'source' command:

    source /etc/os-release
---
 meta/recipes-core/os-release/os-release.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb
index db82760..2fda674 100644
--- a/meta/recipes-core/os-release/os-release.bb
+++ b/meta/recipes-core/os-release/os-release.bb
@@ -29,7 +29,7 @@ python do_compile () {
         for field in d.getVar('OS_RELEASE_FIELDS', True).split():
             value = d.getVar(field, True)
             if value:
-                f.write('{0}={1}\n'.format(field, value))
+                f.write('{0}="{1}"\n'.format(field, value))
     if d.getVar('RPM_SIGN_PACKAGES', True) == '1':
         rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True)
         bb.utils.mkdirhier('${B}/rpm-gpg')
-- 
2.1.4

Re: [PATCH] os-release: put double-quotes around variable contents

[Craig McQueen]

I notice this patch hasn't been applied. Is there anything I can do to improve it?

Regards,
Craig McQueen


> -----Original Message-----
> From: Craig McQueen
> Sent: Thursday, 15 October 2015 4:13 PM
> To: yocto@yoctoproject.org
> Cc: Craig McQueen <craig.mcqueen@innerrange.com>
> Subject: [PATCH] os-release: put double-quotes around variable contents
> 
> This makes the resulting /etc/os-release file have valid shell assignment
> syntax. This makes it loadable by a shell script, using the 'source' command:
> 
>     source /etc/os-release
> ---
>  meta/recipes-core/os-release/os-release.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-
> core/os-release/os-release.bb
> index db82760..2fda674 100644
> --- a/meta/recipes-core/os-release/os-release.bb
> +++ b/meta/recipes-core/os-release/os-release.bb
> @@ -29,7 +29,7 @@ python do_compile () {
>          for field in d.getVar('OS_RELEASE_FIELDS', True).split():
>              value = d.getVar(field, True)
>              if value:
> -                f.write('{0}={1}\n'.format(field, value))
> +                f.write('{0}="{1}"\n'.format(field, value))
>      if d.getVar('RPM_SIGN_PACKAGES', True) == '1':
>          rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True)
>          bb.utils.mkdirhier('${B}/rpm-gpg')
> --
> 2.1.4

Re: [PATCH] os-release: put double-quotes around variable contents

[Craig McQueen]

Sorry, my mistake--it looks as though it was applied. I was looking at an old local "master" that wasn't updated to upstream master.

Regards,
Craig McQueen

> -----Original Message-----
> From: yocto-bounces@yoctoproject.org [mailto:yocto-
> bounces@yoctoproject.org] On Behalf Of Craig McQueen
> Sent: Wednesday, 27 April 2016 1:51 PM
> To: yocto@yoctoproject.org
> Subject: Re: [yocto] [PATCH] os-release: put double-quotes around variable
> contents
> 
> I notice this patch hasn't been applied. Is there anything I can do to improve
> it?
> 
> Regards,
> Craig McQueen
> 
> 
> > -----Original Message-----
> > From: Craig McQueen
> > Sent: Thursday, 15 October 2015 4:13 PM
> > To: yocto@yoctoproject.org
> > Cc: Craig McQueen <craig.mcqueen@innerrange.com>
> > Subject: [PATCH] os-release: put double-quotes around variable
> > contents
> >
> > This makes the resulting /etc/os-release file have valid shell
> > assignment syntax. This makes it loadable by a shell script, using the
> 'source' command:
> >
> >     source /etc/os-release
> > ---
> >  meta/recipes-core/os-release/os-release.bb | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/os-release/os-release.bb
> > b/meta/recipes- core/os-release/os-release.bb index db82760..2fda674
> > 100644
> > --- a/meta/recipes-core/os-release/os-release.bb
> > +++ b/meta/recipes-core/os-release/os-release.bb
> > @@ -29,7 +29,7 @@ python do_compile () {
> >          for field in d.getVar('OS_RELEASE_FIELDS', True).split():
> >              value = d.getVar(field, True)
> >              if value:
> > -                f.write('{0}={1}\n'.format(field, value))
> > +                f.write('{0}="{1}"\n'.format(field, value))
> >      if d.getVar('RPM_SIGN_PACKAGES', True) == '1':
> >          rpm_gpg_pubkey = d.getVar('RPM_GPG_PUBKEY', True)
> >          bb.utils.mkdirhier('${B}/rpm-gpg')
> > --
> > 2.1.4
> 
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto