diff options
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r-- | meta/lib/oe/rootfs.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 95fd3ab7f1..528f50c0df 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -10,11 +10,10 @@ import subprocess | |||
10 | import re | 10 | import re |
11 | 11 | ||
12 | 12 | ||
13 | class Rootfs(object): | 13 | class Rootfs(object, metaclass=ABCMeta): |
14 | """ | 14 | """ |
15 | This is an abstract class. Do not instantiate this directly. | 15 | This is an abstract class. Do not instantiate this directly. |
16 | """ | 16 | """ |
17 | __metaclass__ = ABCMeta | ||
18 | 17 | ||
19 | def __init__(self, d): | 18 | def __init__(self, d): |
20 | self.d = d | 19 | self.d = d |
@@ -51,8 +50,8 @@ class Rootfs(object): | |||
51 | m = r.search(line) | 50 | m = r.search(line) |
52 | if m: | 51 | if m: |
53 | bb.warn('[log_check] %s: found a warning message in the logfile (keyword \'%s\'):\n[log_check] %s' | 52 | bb.warn('[log_check] %s: found a warning message in the logfile (keyword \'%s\'):\n[log_check] %s' |
54 | % (self.d.getVar('PN', True), m.group(), line)) | 53 | % (self.d.getVar('PN', True), m.group(), line)) |
55 | 54 | ||
56 | def _log_check_error(self): | 55 | def _log_check_error(self): |
57 | r = re.compile(self.log_check_regex) | 56 | r = re.compile(self.log_check_regex) |
58 | log_path = self.d.expand("${T}/log.do_rootfs") | 57 | log_path = self.d.expand("${T}/log.do_rootfs") |
@@ -77,7 +76,7 @@ class Rootfs(object): | |||
77 | found_error = 1 | 76 | found_error = 1 |
78 | bb.warn('[log_check] In line: [%s]' % line) | 77 | bb.warn('[log_check] In line: [%s]' % line) |
79 | bb.warn('[log_check] %s: found an error message in the logfile (keyword \'%s\'):\n[log_check] %s' | 78 | bb.warn('[log_check] %s: found an error message in the logfile (keyword \'%s\'):\n[log_check] %s' |
80 | % (self.d.getVar('PN', True), m.group(), line)) | 79 | % (self.d.getVar('PN', True), m.group(), line)) |
81 | 80 | ||
82 | if found_error >= 1 and found_error <= 5: | 81 | if found_error >= 1 and found_error <= 5: |
83 | message += line + '\n' | 82 | message += line + '\n' |
@@ -485,7 +484,7 @@ class RpmRootfs(Rootfs): | |||
485 | continue | 484 | continue |
486 | # sh -x may emit code which isn't actually executed | 485 | # sh -x may emit code which isn't actually executed |
487 | if line.startswith('+'): | 486 | if line.startswith('+'): |
488 | continue | 487 | continue |
489 | 488 | ||
490 | m = r.search(line) | 489 | m = r.search(line) |
491 | if m: | 490 | if m: |
@@ -565,7 +564,7 @@ class DpkgOpkgRootfs(Rootfs): | |||
565 | pkg_depends = m_depends.group(1) | 564 | pkg_depends = m_depends.group(1) |
566 | 565 | ||
567 | # remove package dependencies not in postinsts | 566 | # remove package dependencies not in postinsts |
568 | pkg_names = pkgs.keys() | 567 | pkg_names = list(pkgs.keys()) |
569 | for pkg_name in pkg_names: | 568 | for pkg_name in pkg_names: |
570 | deps = pkgs[pkg_name][:] | 569 | deps = pkgs[pkg_name][:] |
571 | 570 | ||
@@ -598,7 +597,7 @@ class DpkgOpkgRootfs(Rootfs): | |||
598 | pkgs = self._get_pkgs_postinsts(status_file) | 597 | pkgs = self._get_pkgs_postinsts(status_file) |
599 | if pkgs: | 598 | if pkgs: |
600 | root = "__packagegroup_postinst__" | 599 | root = "__packagegroup_postinst__" |
601 | pkgs[root] = pkgs.keys() | 600 | pkgs[root] = list(pkgs.keys()) |
602 | _dep_resolve(pkgs, root, pkg_list, []) | 601 | _dep_resolve(pkgs, root, pkg_list, []) |
603 | pkg_list.remove(root) | 602 | pkg_list.remove(root) |
604 | 603 | ||