package.bbclass: Adjust to handle split packages already being present in PACKAGES

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5177 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 1732a114f4e529ec56a3d4c82e2624140d35c515..a2674032956c579065b82b16682679e8aa56f88b 100644 (file)
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -79,6 +79,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
                                packages = [pkg] + packages
                        else:
                                packages.append(pkg)
+               oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
+               if not oldfiles:
                        the_files = [os.path.join(root, o)]
                        if aux_files_pattern:
                                if type(aux_files_pattern) is list:
@@ -106,9 +108,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
                        if postrm:
                                bb.data.setVar('pkg_postrm_' + pkg, postrm, d)
                else:
-                       oldfiles = bb.data.getVar('FILES_' + pkg, d, 1)
-                       if not oldfiles:
-                               bb.fatal("Package '%s' exists but has no files" % pkg)
                        bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d)
                if callable(hook):
                        hook(f, pkg, file_regex, output_pattern, m.group(1))