summaryrefslogtreecommitdiffstats
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:53:18 +0100
commitc9821a56da9c6e341408ea21e0d8a4cc5291dba6 (patch)
tree5fc5f47e082465e5e8bd26d9f3e331b58f473c3a
parentd47c496aa058f5b18d03a68bcd79e5c8607de34f (diff)
downloadopenembedded-core-contrib-c9821a56da9c6e341408ea21e0d8a4cc5291dba6.tar.gz
openembedded-core-contrib-c9821a56da9c6e341408ea21e0d8a4cc5291dba6.tar.bz2
openembedded-core-contrib-c9821a56da9c6e341408ea21e0d8a4cc5291dba6.zip
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>
-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):
alternative_pns.append(pn[1:])
elif pn.startswith('!'):
postinst_pns.append(pn[1:])
+ elif selectpn:
+ # hit here with multilibs
+ continue
else:
selectpn = pn