[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7407/8267] package.py: Fix some lint errors
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7407/8267] package.py: Fix some lint errors
- Date: Sun, 17 Dec 2017 06:12:18 +0000 (UTC)
commit f46240c7ba1bb6dca421a9744bfb47c1bea44b74
Author: Tobias Hagelborn <tobias hagelborn axis com>
Date: Fri Aug 25 13:32:36 2017 +0200
package.py: Fix some lint errors
- rename type to exec_type not to shadow type
- rename isELF is_elf
(From OE-Core rev: c72bd726d3e8495aae3e57f524c43b3be6367796)
Signed-off-by: Tobias Hagelborn <tobiasha axis com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/lib/oe/package.py | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index a79c668..839e9a2 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -67,24 +67,23 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, qa_already_stripped=
# 4 - executable
# 8 - shared library
# 16 - kernel module
- def isELF(path):
- type = 0
+ def is_elf(path):
+ exec_type = 0
ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
if ret:
bb.error("split_and_strip_files: 'file %s' failed" % path)
- return type
+ return exec_type
- # Not stripped
if "ELF" in result:
- type |= 1
+ exec_type |= 1
if "not stripped" not in result:
- type |= 2
+ exec_type |= 2
if "executable" in result:
- type |= 4
+ exec_type |= 4
if "shared" in result:
- type |= 8
- return type
+ exec_type |= 8
+ return exec_type
elffiles = {}
@@ -119,7 +118,7 @@ def strip_execs(pn, dstdir, strip_cmd, libdir, base_libdir, qa_already_stripped=
# It's a file (or hardlink), not a link
# ...but is it ELF, and is it already stripped?
- elf_file = isELF(file)
+ elf_file = is_elf(file)
if elf_file & 1:
if elf_file & 2:
if qa_already_stripped:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]