From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 590E775EE7 for ; Tue, 10 Nov 2015 11:10:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id tAABAFmA007921 for ; Tue, 10 Nov 2015 11:10:15 GMT Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 3gzVNFt7KYlL for ; Tue, 10 Nov 2015 11:10:15 +0000 (GMT) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id tAAB9x7l007891 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 10 Nov 2015 11:10:12 GMT Message-ID: <1447149349.3559.214.camel@linuxfoundation.org> From: Richard Purdie To: bitbake-devel Date: Tue, 10 Nov 2015 09:55:49 +0000 Mime-Version: 1.0 X-Mailer: Evolution 3.12.11-0ubuntu3 Subject: [PATCH] parse: Don't try to expand __base_depends/__depends X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussion that advance bitbake development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2015 11:10:16 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Trying to expand a variable which isn't a string doesn't make sense. Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 67ec71f..26ae7ea 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py @@ -161,8 +161,8 @@ def vars_from_file(mypkg, d): def get_file_depends(d): '''Return the dependent files''' dep_files = [] - depends = d.getVar('__base_depends', True) or [] - depends = depends + (d.getVar('__depends', True) or []) + depends = d.getVar('__base_depends', False) or [] + depends = depends + (d.getVar('__depends', False) or []) for (fn, _) in depends: dep_files.append(os.path.abspath(fn)) return " ".join(dep_files)