diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-12-14 14:55:49 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-11 10:39:09 +0000 |
commit | f476905b9c76b909e255aa733f896f6aa4ac2bfa (patch) | |
tree | 29419e8d08bcc6edf19aba467e56283a7842bdf9 /meta | |
parent | 8483929d1657772513a543a121bcd789f426cce3 (diff) | |
download | poky-f476905b9c76b909e255aa733f896f6aa4ac2bfa.tar.gz |
package.bbclass: Do not hide cpio's error
We use subprocess.check_output() to run the command, which means that we need care
about the error, so the 2>/dev/null should not be used, otherwise it is hard to
debug when the error happens.
I guess it was copied from previous lines, but that command's error can be
ignored (excpet: pass):
try:
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError:
# Can "fail" if internal headers/transient sources are attempted
pass
But we don't do this in the current location, so remove "2>/dev/null"
(From OE-Core rev: 017a53d2743be2b5d4965a39b4e126fb74f700ad)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 322c4ec77f..be316510a6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -471,7 +471,8 @@ def copydebugsources(debugsrcdir, d): | |||
471 | 471 | ||
472 | # cpio seems to have a bug with -lL together and symbolic links are just copied, not dereferenced. | 472 | # cpio seems to have a bug with -lL together and symbolic links are just copied, not dereferenced. |
473 | # Work around this by manually finding and copying any symbolic links that made it through. | 473 | # Work around this by manually finding and copying any symbolic links that made it through. |
474 | cmd = "find %s%s -type l -print0 -delete | sed s#%s%s/##g | (cd '%s' ; cpio -pd0mL --no-preserve-owner '%s%s' 2>/dev/null)" % (dvar, debugsrcdir, dvar, debugsrcdir, workparentdir, dvar, debugsrcdir) | 474 | cmd = "find %s%s -type l -print0 -delete | sed s#%s%s/##g | (cd '%s' ; cpio -pd0mL --no-preserve-owner '%s%s')" % \ |
475 | (dvar, debugsrcdir, dvar, debugsrcdir, workparentdir, dvar, debugsrcdir) | ||
475 | subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) | 476 | subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) |
476 | 477 | ||
477 | # The copy by cpio may have resulted in some empty directories! Remove these | 478 | # The copy by cpio may have resulted in some empty directories! Remove these |