[oe-commits] Richard Purdie : recipetool/append: Fix selftest failure with multilib

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: c9821a56da9c6e341408ea21e0d8a4cc5291dba6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c9821a56da9c6e341408ea21e0d8a4cc5291dba6

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Jul 10 14:12:46 2015 +0100

recipetool/append: Fix selftest failure with multilib

If you have multilib enabled, it finds lib32-base-files instead of
base-files for test_recipetool_appendfile_basic causing a test
failure. Add a fix for this.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/lib/recipetool/append.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 9903871..a2133f7 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -280,6 +280,9 @@ def appendfile(args):
                 alternative_pns.append(pn[1:])
             elif pn.startswith('!'):
                 postinst_pns.append(pn[1:])
+            elif selectpn:
+                # hit here with multilibs
+                continue
             else:
                 selectpn = pn