From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 10 Jul 2015 13:12:46 +0000 (+0100)
Subject: recipetool/append: Fix selftest failure with multilib
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~29803
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9821a56da9c6e341408ea21e0d8a4cc5291dba6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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@linuxfoundation.org>
---

diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 9903871ab04..a2133f7a898 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