Patchwork package.bbclass: do_split_packages should always return something.

login
register
mail settings
Submitter Josua Mayer
Date Feb. 14, 2014, 3:02 p.m.
Message ID <1392390144-16540-1-git-send-email-josua.mayer97@gmail.com>
Download mbox | patch
Permalink /patch/66763/
State New
Headers show

Comments

Josua Mayer - Feb. 14, 2014, 3:02 p.m.
So far, when do_split_packages is passed a non-existing folder, it will return nothing.
While building Mesa with PACKAGECONFIG="egl gles" for qemux86, do_package threw a nice exception on a line reading "pkgs += do_split_packages":
"Exception: TypeError: 'NoneType' object is not iterable"
I think a function should always return something, and in this specific case, returning an empty list should be right.
This patch simply fixes the return statement to do just that.

Signed-off-by: Josua Mayer <josua.mayer97@gmail.com>
---
 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 042d74c..297d962 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -126,7 +126,7 @@  def do_split_packages(d, root, file_regex, output_pattern, description, postinst
     # If the root directory doesn't exist, don't error out later but silently do
     # no splitting.
     if not os.path.exists(dvar + root):
-        return
+        return []
 
     ml = d.getVar("MLPREFIX", True)
     if ml: