Patchwork [bitbake-devel] hob/imageconfigurationpage: a 'hob-image' appears listed in the base image combo box

login
register
mail settings
Submitter Cristiana Voicu
Date Oct. 8, 2012, 9:01 a.m.
Message ID <1349686879-25765-1-git-send-email-cristiana.voicu@intel.com>
Download mbox | patch
Permalink /patch/37907/
State New
Headers show

Comments

Cristiana Voicu - Oct. 8, 2012, 9:01 a.m.
-remove this image from image combo box

[YOCTO #3230]
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Richard Purdie - Oct. 8, 2012, 9:47 a.m.
On Mon, 2012-10-08 at 12:01 +0300, Cristiana Voicu wrote:
> -remove this image from image combo box
> 
> [YOCTO #3230]
> Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
> ---
>  bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
> index e1c7a67..32e5c45 100644
> --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
> +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
> @@ -368,6 +368,7 @@ class ImageConfigurationPage (HobPage):
>          if self.builder.parameters.image_black_pattern:
>              for i in self.builder.parameters.image_black_pattern.split():
>                  black_pattern.append(re.compile(i))
> +        black_pattern.append("hob-image")
>  
>          it = image_model.get_iter_first()
>          self._image_combo_disconnect_signal()
> @@ -386,13 +387,13 @@ class ImageConfigurationPage (HobPage):
>              if black_pattern:
>                  allow = True
>                  for pattern in black_pattern:
> -                    if pattern.search(image_name):
> +                    if image_name in pattern:
>                          allow = False
>                          break
>              elif white_pattern:
>                  allow = False
>                  for pattern in white_pattern:
> -                    if pattern.search(image_name):
> +                    if image_name in pattern:
>                          allow = True
>                          break
>              else:

>>> import re
>>> foo=re.compile("bar.*")
>>> if "bar1" in foo:
...     print "ok"
... 
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: argument of type '_sre.SRE_Pattern' is not iterable

which is effectively what you're doing above. You probably want
something like:

+        black_pattern.append(re.compile("hob-image"))

and leave the .search() calls in?

Cheers,

Richard

Patch

diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index e1c7a67..32e5c45 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -368,6 +368,7 @@  class ImageConfigurationPage (HobPage):
         if self.builder.parameters.image_black_pattern:
             for i in self.builder.parameters.image_black_pattern.split():
                 black_pattern.append(re.compile(i))
+        black_pattern.append("hob-image")
 
         it = image_model.get_iter_first()
         self._image_combo_disconnect_signal()
@@ -386,13 +387,13 @@  class ImageConfigurationPage (HobPage):
             if black_pattern:
                 allow = True
                 for pattern in black_pattern:
-                    if pattern.search(image_name):
+                    if image_name in pattern:
                         allow = False
                         break
             elif white_pattern:
                 allow = False
                 for pattern in white_pattern:
-                    if pattern.search(image_name):
+                    if image_name in pattern:
                         allow = True
                         break
             else: