From c9821a56da9c6e341408ea21e0d8a4cc5291dba6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 10 Jul 2015 14:12:46 +0100 Subject: 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 --- 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 9903871ab0..a2133f7a89 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 -- cgit 1.2.3-korg