Patchwork package.bbclass: don't error when the root doesn't exist in do_split_packages

login
register
mail settings
Submitter Ross Burton
Date July 25, 2012, 4:36 p.m.
Message ID <1343234199-21520-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/33043/
State New
Headers show

Comments

Ross Burton - July 25, 2012, 4:36 p.m.
If nothing has been installed in the root automake 1.12 won't install the
directory, which means os.walk will throw a file not found exception.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/package.bbclass |    4 ++++
 1 file changed, 4 insertions(+)
Ross Burton - July 25, 2012, 4:39 p.m.
Ignore this, typo in the python.

On 25 July 2012 17:36, Ross Burton <ross.burton@intel.com> wrote:
> If nothing has been installed in the root automake 1.12 won't install the
> directory, which means os.walk will throw a file not found exception.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/classes/package.bbclass |    4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index fc83424..0ddf788 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -74,6 +74,10 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
>      given package, usually plugins or modules.
>      """
>
> +    # If the root doesn't exist, return early
> +    if not os.path.exists(dvar + root):
> +        return
> +
>      ml = d.getVar("MLPREFIX", True)
>      if ml:
>          if not output_pattern.startswith(ml):
> --
> 1.7.10
>

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index fc83424..0ddf788 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -74,6 +74,10 @@  def do_split_packages(d, root, file_regex, output_pattern, description, postinst
     given package, usually plugins or modules.
     """
 
+    # If the root doesn't exist, return early
+    if not os.path.exists(dvar + root):
+        return
+
     ml = d.getVar("MLPREFIX", True)
     if ml:
         if not output_pattern.startswith(ml):