* [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id()
@ 2018-03-24 4:55 Andre McCurdy
2018-03-24 4:55 ` [PATCH 2/2] package.bbclass: use single quotes for path passed to file in isELF() Andre McCurdy
2018-03-26 9:47 ` [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id() Burton, Ross
0 siblings, 2 replies; 3+ messages in thread
From: Andre McCurdy @ 2018-03-24 4:55 UTC (permalink / raw)
To: openembedded-core
Although get_filesystem_id() is a private API and never gets passed
a path containing spaces or other special characters, etc, quote the
path anyway for consistency.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/classes/sanity.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 6716985..e0e57ce 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -336,7 +336,7 @@ def check_path_length(filepath, pathname, limit):
return ""
def get_filesystem_id(path):
- status, result = oe.utils.getstatusoutput("stat -f -c '%s' %s" % ("%t", path))
+ status, result = oe.utils.getstatusoutput("stat -f -c '%s' '%s'" % ("%t", path))
if status == 0:
return result
else:
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] package.bbclass: use single quotes for path passed to file in isELF()
2018-03-24 4:55 [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id() Andre McCurdy
@ 2018-03-24 4:55 ` Andre McCurdy
2018-03-26 9:47 ` [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id() Burton, Ross
1 sibling, 0 replies; 3+ messages in thread
From: Andre McCurdy @ 2018-03-24 4:55 UTC (permalink / raw)
To: openembedded-core
Apparently there are recipes in the wild which generate files with
filenames containing '$' characters - which cause errors during
packaging.
Instead of adding another special case to escape '$' characters when
constructing the command passed to oe.utils.getstatusoutput(), switch
to using single quotes to quote the path - and therefore make isELF()
consistent with the way filenames and paths are quoted by every other
caller of oe.utils.getstatusoutput() in oe-core.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/classes/package.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 83f53a4..504c023 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -918,7 +918,7 @@ python split_and_strip_files () {
# 16 - kernel module
def isELF(path):
type = 0
- ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
+ ret, result = oe.utils.getstatusoutput("file '%s'" % path)
if ret:
msg = "split_and_strip_files: 'file %s' failed" % path
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id()
2018-03-24 4:55 [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id() Andre McCurdy
2018-03-24 4:55 ` [PATCH 2/2] package.bbclass: use single quotes for path passed to file in isELF() Andre McCurdy
@ 2018-03-26 9:47 ` Burton, Ross
1 sibling, 0 replies; 3+ messages in thread
From: Burton, Ross @ 2018-03-26 9:47 UTC (permalink / raw)
To: Andre McCurdy; +Cc: OE-core
A better fix would be to not use getstatusoutput() at all, but
directly hit subprocess and pass the argument as a list.
Ross
On 24 March 2018 at 04:55, Andre McCurdy <armccurdy@gmail.com> wrote:
> Although get_filesystem_id() is a private API and never gets passed
> a path containing spaces or other special characters, etc, quote the
> path anyway for consistency.
>
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
> meta/classes/sanity.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 6716985..e0e57ce 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -336,7 +336,7 @@ def check_path_length(filepath, pathname, limit):
> return ""
>
> def get_filesystem_id(path):
> - status, result = oe.utils.getstatusoutput("stat -f -c '%s' %s" % ("%t", path))
> + status, result = oe.utils.getstatusoutput("stat -f -c '%s' '%s'" % ("%t", path))
> if status == 0:
> return result
> else:
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-26 9:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-24 4:55 [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id() Andre McCurdy
2018-03-24 4:55 ` [PATCH 2/2] package.bbclass: use single quotes for path passed to file in isELF() Andre McCurdy
2018-03-26 9:47 ` [PATCH 1/2] sanity.bbclass: quote path passed to stat in get_filesystem_id() Burton, Ross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.