[yocto-autobuilder][PATCHv2] PublishLayerTarballs.py: don't change directories for Eclipse builds

[yocto-autobuilder][PATCHv2] PublishLayerTarballs.py: don't change directories for Eclipse builds

[Bill Randle]

When publishing eclipse tarballs, we are already in the correct directory,
so skip the change direction operation (which will generate an error).

Signed-off-by: Bill Randle <william.c.randle@intel.com>
---
V2: fix Python syntax error

 .../site-packages/autobuilder/buildsteps/PublishLayerTarballs.py       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py
index c140725..7c1ce4a 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/PublishLayerTarballs.py
@@ -38,7 +38,8 @@ class PublishLayerTarballs(ShellCommand):
         snapshot = ""
         self.basedir=os.path.join(os.path.join(os.path.join(
                                     self.workerdir, buildername), self.workdir))
-        if self.layername is not "poky":
+        if self.layername is not "poky"
+           and "eclipse" not in self.layername:
             command = "cd " + self.layername + ";"
         else:
             command = ""
-- 
2.5.5

Re: [yocto-autobuilder][PATCHv2] PublishLayerTarballs.py: don't change directories for Eclipse builds

[Joshua G Lock]

On Tue, 2016-07-12 at 09:57 -0700, Bill Randle wrote:
> When publishing eclipse tarballs, we are already in the correct
> directory,
> so skip the change direction operation (which will generate an
> error).
> 
> Signed-off-by: Bill Randle <william.c.randle@intel.com>
> ---
> V2: fix Python syntax error
> 
>  .../site-
> packages/autobuilder/buildsteps/PublishLayerTarballs.py       | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishLayerTarballs.py
> b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishLayerTarballs.py
> index c140725..7c1ce4a 100644
> --- a/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishLayerTarballs.py
> +++ b/lib/python2.7/site-
> packages/autobuilder/buildsteps/PublishLayerTarballs.py
> @@ -38,7 +38,8 @@ class PublishLayerTarballs(ShellCommand):
>          snapshot = ""
>          self.basedir=os.path.join(os.path.join(os.path.join(
>                                      self.workerdir, buildername),
> self.workdir))
> -        if self.layername is not "poky":
> +        if self.layername is not "poky"
> +           and "eclipse" not in self.layername:

I believe this is still broken?

It's invalid syntax to continue an if statement on a new line without
either a) a backslash for line continuation or b) enclosing the
statement in parentheses (and thereby using implied continuation).

Cheers,

Joshua

>              command = "cd " + self.layername + ";"
>          else:
>              command = ""