[PATCH] ignore .svn directory in intercepts_dir

[PATCH] ignore .svn directory in intercepts_dir

[Holger Schröder]

Hi all,

i would like to get this patch into openembedded-core.
i hope this mail is in the correct form. Please tell
me if not.

kind regards, Holger

Patch description:

A customer of mine still runs svn. And when i build
a rootfs in a jenkins job on the master node, i get
a python exception because the .svn directory cannot
be executed as an interceptor as it seems.

With this patch a possible ".svn" subdirectory in
that directory will be ignred, and my jenkins build
succeeds.

Signed-off-by: Holger Schröder <holger@holgis.net>
---
 meta/lib/oe/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 96591f3..e99aa67 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -296,7 +296,7 @@ class Rootfs(object, metaclass=ABCMeta):
         for script in os.listdir(intercepts_dir):
             script_full = os.path.join(intercepts_dir, script)
 
-            if script == "postinst_intercept" or not os.access(script_full, os.X_OK):
+            if script == "postinst_intercept" or script == ".svn" or not os.access(script_full, os.X_OK):
                 continue
 
             bb.note("> Executing %s intercept ..." % script)
-- 
2.7.4

Re: [PATCH] ignore .svn directory in intercepts_dir

[Richard Purdie]

On Thu, 2017-08-24 at 12:14 +0200, Holger Schröder wrote:
> Hi all,
> 
> i would like to get this patch into openembedded-core.
> i hope this mail is in the correct form. Please tell
> me if not.
> 
> kind regards, Holger
> 
> Patch description:
> 
> A customer of mine still runs svn. And when i build
> a rootfs in a jenkins job on the master node, i get
> a python exception because the .svn directory cannot
> be executed as an interceptor as it seems.
> 
> With this patch a possible ".svn" subdirectory in
> that directory will be ignred, and my jenkins build
> succeeds.
> 
> Signed-off-by: Holger Schröder <holger@holgis.net>
> ---
>  meta/lib/oe/rootfs.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
> index 96591f3..e99aa67 100644
> --- a/meta/lib/oe/rootfs.py
> +++ b/meta/lib/oe/rootfs.py
> @@ -296,7 +296,7 @@ class Rootfs(object, metaclass=ABCMeta):
>          for script in os.listdir(intercepts_dir):
>              script_full = os.path.join(intercepts_dir, script)
>  
> -            if script == "postinst_intercept" or not
> os.access(script_full, os.X_OK):
> +            if script == "postinst_intercept" or script == ".svn" or
> not os.access(script_full, os.X_OK):
>                  continue
>  
>              bb.note("> Executing %s intercept ..." % script)


I think a better, more general solution here would be to add:

if script.startswith("."):
     continue

?

Cheers,

Richard

Re: [PATCH] ignore .svn directory in intercepts_dir

[Holger Schröder]

> Richard Purdie <richard.purdie@linuxfoundation.org> hat am 24. August 2017 um 12:16 geschrieben:
> 
> 
> On Thu, 2017-08-24 at 12:14 +0200, Holger Schröder wrote:
> > Hi all,
> > 
> > i would like to get this patch into openembedded-core.
> > i hope this mail is in the correct form. Please tell
> > me if not.
> > 
> > kind regards, Holger
> > 
> > Patch description:
> > 
> > A customer of mine still runs svn. And when i build
> > a rootfs in a jenkins job on the master node, i get
> > a python exception because the .svn directory cannot
> > be executed as an interceptor as it seems.
> > 
> > With this patch a possible ".svn" subdirectory in
> > that directory will be ignred, and my jenkins build
> > succeeds.
> > 
> > Signed-off-by: Holger Schröder <holger@holgis.net>
> > ---
> >  meta/lib/oe/rootfs.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
> > index 96591f3..e99aa67 100644
> > --- a/meta/lib/oe/rootfs.py
> > +++ b/meta/lib/oe/rootfs.py
> > @@ -296,7 +296,7 @@ class Rootfs(object, metaclass=ABCMeta):
> >          for script in os.listdir(intercepts_dir):
> >              script_full = os.path.join(intercepts_dir, script)
> >  
> > -            if script == "postinst_intercept" or not
> > os.access(script_full, os.X_OK):
> > +            if script == "postinst_intercept" or script == ".svn" or
> > not os.access(script_full, os.X_OK):
> >                  continue
> >  
> >              bb.note("> Executing %s intercept ..." % script)
> 
> 
> I think a better, more general solution here would be to add:
> 
> if script.startswith("."):
>      continue
> 
> ?
> 
my first goal was to be less "invasive", but thinking
about it the more general solution is better.

i will update the patch.

> Cheers,
> 
> Richard
> 
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

✗ patchtest: failure for ignore .svn directory in intercepts_dir

[Patchwork]

== Series Details ==

Series: ignore .svn directory in intercepts_dir
Revision: 1
URL   : https://patchwork.openembedded.org/series/8479/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Patch            ignore .svn directory in intercepts_dir
 Issue             Shortlog does not follow expected format [test_shortlog_format] 
  Suggested fix    Commit shortlog (first line of commit message) should follow the format "<target>: <summary>"



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe