summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oe/rootfs.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index e5512d09ef..4273891699 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -519,17 +519,29 @@ class DpkgOpkgRootfs(Rootfs):
519 m_status = re.match("^Status:.*unpacked", line) 519 m_status = re.match("^Status:.*unpacked", line)
520 m_depends = re.match("^Depends: (.*)", line) 520 m_depends = re.match("^Depends: (.*)", line)
521 521
522 #Only one of m_pkg, m_status or m_depends is not None at time
523 #If m_pkg is not None, we started a new package
522 if m_pkg is not None: 524 if m_pkg is not None:
523 if pkg_name and pkg_status_match: 525 #Get Package name
524 pkgs[pkg_name] = _get_pkg_depends_list(pkg_depends)
525
526 pkg_name = m_pkg.group(1) 526 pkg_name = m_pkg.group(1)
527 #Make sure we reset other variables
527 pkg_status_match = False 528 pkg_status_match = False
528 pkg_depends = "" 529 pkg_depends = ""
529 elif m_status is not None: 530 elif m_status is not None:
531 #New status matched
530 pkg_status_match = True 532 pkg_status_match = True
531 elif m_depends is not None: 533 elif m_depends is not None:
534 #New depends macthed
532 pkg_depends = m_depends.group(1) 535 pkg_depends = m_depends.group(1)
536 else:
537 pass
538
539 #Now check if we can process package depends and postinst
540 if "" != pkg_name and pkg_status_match:
541 pkgs[pkg_name] = _get_pkg_depends_list(pkg_depends)
542 else:
543 #Not enough information
544 pass
533 545
534 # remove package dependencies not in postinsts 546 # remove package dependencies not in postinsts
535 pkg_names = list(pkgs.keys()) 547 pkg_names = list(pkgs.keys())