[yocto] [yocto-autobuilder][PATCH v2] PublishArtifacts.py: fix filecheck to work under dash (or other POSIX shell)

Joshua Lock joshua.g.lock at linux.intel.com
Mon Aug 22 08:21:57 PDT 2016


On Mon, 2016-08-22 at 07:52 -0700, Bill Randle wrote:
> An earlier patch (ed3857990) to check for existing msd5sum files
> worked
> fine when tested under bash, but failed with an error message about
> [[
> not found when run under dash. Updated the test to not rely on
> bashisms.

Pushed to master, thanks!

Joshua

> 
> Signed-off-by: Bill Randle <william.c.randle at intel.com>
> ---
> 
> V2: use POSIX shell expansion for simplified test (thanks Joshua)
> 
>  lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> index d8b554f..e738521 100644
> --- a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> +++ b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishArtifacts.py
> @@ -260,7 +260,7 @@ class PublishArtifacts(ShellCommand):
>          cmd = ""
>          if os.environ.get('GEN_IMG_MD5') == "True":
>              cmd += "for x in `find " + deploy_dir + " -maxdepth 5
> -type f`;"
> -            cmd += "do if [[ $x != *.md5sum ]]; then md5sum $x >> "
> + "$x.md5sum; fi; done;"
> +            cmd += "do if [ ${x##*.} != md5sum ]; then md5sum $x >>
> " + "$x.md5sum; fi; done;"
>          return cmd
>  
>      def getDeployNames(self, artifact, buildername):



More information about the yocto mailing list