summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-10 14:12:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-12 22:55:38 +0100
commitee69463f4e2e4f6eac86385e36edda2fccbae7fd (patch)
treee52a00c3abd82dc7ea5e322ceedaf873547a7423 /scripts/lib
parentb60521c9b3ec9573ba987fc5ca0c7431bc5ad148 (diff)
downloadpoky-ee69463f4e2e4f6eac86385e36edda2fccbae7fd.tar.gz
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. (From OE-Core rev: c9821a56da9c6e341408ea21e0d8a4cc5291dba6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/recipetool/append.py3
1 files changed, 3 insertions, 0 deletions
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):
280 alternative_pns.append(pn[1:]) 280 alternative_pns.append(pn[1:])
281 elif pn.startswith('!'): 281 elif pn.startswith('!'):
282 postinst_pns.append(pn[1:]) 282 postinst_pns.append(pn[1:])
283 elif selectpn:
284 # hit here with multilibs
285 continue
283 else: 286 else:
284 selectpn = pn 287 selectpn = pn
285 288