[oe-commits] Denis 'GNUtoo' Carikli : task-shr-minimal: fix case when binary locales generation is disabled

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e2e1cf695fa8577cd211506d9d0f0f575423472c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e2e1cf695fa8577cd211506d9d0f0f575423472c

Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Sun Jul 11 00:35:32 2010 +0200

task-shr-minimal: fix case when binary locales generation is disabled

2 issues were present:
*disabled was a string and so,when binary locales generation was disabled
  it never executed the return statement
  For fixing it,I've copied and adapted the glibc code that JaMa pointed me out:
  FreeNode-#oe.log:Jul 09 14:19:26
    <JaMa>	GNUtoo|laptop: glibc/glibc-package.inc is using "if enabled and int(enabled):"
*return should return "",else the dependency of task-shr-minimal are "None".

I also bumped PR

---

 recipes/tasks/task-shr-minimal.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index d4be115..6f82334 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Lite Image Feed"
-PR = "r31"
+PR = "r32"
 PV = "2.0"
 LICENSE = "GPL"
 
@@ -11,8 +11,8 @@ def get_rdepends(bb, d):
     enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
 
     # If locale is disabled, bail out
-    if not enabled:
-        return
+    if not enabled or not int(enabled):
+        return ""
 
     locales = bb.data.getVar("GLIBC_GENERATE_LOCALES", d, 1)
     if not locales or locales == "all":