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 <hol...@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
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
