From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mail.openembedded.org (Postfix) with ESMTP id 02C5E7702D for ; Wed, 2 Sep 2015 13:54:51 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 02 Sep 2015 06:54:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,453,1437462000"; d="scan'208";a="760853549" Received: from linux.intel.com ([10.23.219.25]) by orsmga001.jf.intel.com with ESMTP; 02 Sep 2015 06:54:51 -0700 Received: from linux.intel.com (vmed.fi.intel.com [10.237.72.65]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTP id 858CA6A4083; Wed, 2 Sep 2015 06:53:59 -0700 (PDT) Date: Wed, 2 Sep 2015 16:54:45 +0300 From: Ed Bartosh To: Jussi Kukkonen Message-ID: <20150902135445.GA5916@linux.intel.com> References: <8c9a985168c6e8d52ac777bc7322c6fda92983c2.1440950164.git.ed.bartosh@linux.intel.com> MIME-Version: 1.0 In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH 01/11] devtool: make 2 functions public X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ed.bartosh@linux.intel.com List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2015 13:54:53 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Sep 02, 2015 at 02:16:58PM +0300, Jussi Kukkonen wrote: > On 30 August 2015 at 19:08, Ed Bartosh wrote: > > > > Moved standard.py:_parse_recipe -> __init__.py:parse_recipe and > > standard.py:_get_recipe_file -> __init__.py:get_recipe_file > > to be able to call them from other modules. > > Hi Ed, > > Can you take a look if the failures in > https://autobuilder.yoctoproject.org/main/builders/nightly-oe-selftest/builds/173/steps/Running%20oe-selftest/logs/stdio > are related to this patch (there's lots of "NameError: global name > '_parse_recipe' is not defined") > The autobuilder log looks very strange to me. I don't see any mentioning of _parse_recipe in standard.py on master. Moreover, there is no _prep_extract_operation function mentioned in traceback. I've just run failed test and it passed without any issues. It looks like autobuilder messed the code from some old branch and tests from master. Regards, Ed > > > > > Signed-off-by: Ed Bartosh > > --- > > scripts/lib/devtool/__init__.py | 27 +++++++++++++++++++++++++++ > > scripts/lib/devtool/standard.py | 36 ++++-------------------------------- > > 2 files changed, 31 insertions(+), 32 deletions(-) > > > > diff --git a/scripts/lib/devtool/__init__.py > b/scripts/lib/devtool/__init__.py > > index 1747fff..97ac6ae 100644 > > --- a/scripts/lib/devtool/__init__.py > > +++ b/scripts/lib/devtool/__init__.py > > @@ -116,3 +116,30 @@ def add_md5(config, recipename, filename): > > md5 = bb.utils.md5_file(filename) > > with open(os.path.join(config.workspace_path, '.devtool_md5'), 'a') > as f: > > f.write('%s|%s|%s\n' % (recipename, os.path.relpath(filename, > config.workspace_path), md5)) > > + > > +def get_recipe_file(cooker, pn): > > + """Find recipe file corresponding a package name""" > > + import oe.recipeutils > > + recipefile = oe.recipeutils.pn_to_recipe(cooker, pn) > > + if not recipefile: > > + skipreasons = oe.recipeutils.get_unavailable_reasons(cooker, pn) > > + if skipreasons: > > + logger.error('\n'.join(skipreasons)) > > + else: > > + logger.error("Unable to find any recipe file matching %s" % > pn) > > + return recipefile > > + > > +def parse_recipe(config, tinfoil, pn, appends): > > + """Parse recipe of a package""" > > + import oe.recipeutils > > + recipefile = get_recipe_file(tinfoil.cooker, pn) > > + if not recipefile: > > + # Error already logged > > + return None > > + if appends: > > + append_files = > tinfoil.cooker.collection.get_file_appends(recipefile) > > + # Filter out appends from the workspace > > + append_files = [path for path in append_files if > > + not path.startswith(config.workspace_path)] > > + return oe.recipeutils.parse_recipe(recipefile, append_files, > > + tinfoil.config_data) > > diff --git a/scripts/lib/devtool/standard.py > b/scripts/lib/devtool/standard.py > > index 4aa6ebd..97c45d9 100644 > > --- a/scripts/lib/devtool/standard.py > > +++ b/scripts/lib/devtool/standard.py > > @@ -26,7 +26,7 @@ import argparse > > import scriptutils > > import errno > > from devtool import exec_build_env_command, setup_tinfoil, DevtoolError > > -from devtool import add_md5 > > +from devtool import add_md5, parse_recipe > > > > logger = logging.getLogger('devtool') > > > > @@ -157,34 +157,6 @@ def _check_compatible_recipe(pn, d): > > "from working. You will need to disable this " > > "first." % pn) > > > > -def _get_recipe_file(cooker, pn): > > - """Find recipe file corresponding a package name""" > > - import oe.recipeutils > > - recipefile = oe.recipeutils.pn_to_recipe(cooker, pn) > > - if not recipefile: > > - skipreasons = oe.recipeutils.get_unavailable_reasons(cooker, pn) > > - if skipreasons: > > - logger.error('\n'.join(skipreasons)) > > - else: > > - logger.error("Unable to find any recipe file matching %s" % > pn) > > - return recipefile > > - > > -def _parse_recipe(config, tinfoil, pn, appends): > > - """Parse recipe of a package""" > > - import oe.recipeutils > > - recipefile = _get_recipe_file(tinfoil.cooker, pn) > > - if not recipefile: > > - # Error already logged > > - return None > > - if appends: > > - append_files = > tinfoil.cooker.collection.get_file_appends(recipefile) > > - # Filter out appends from the workspace > > - append_files = [path for path in append_files if > > - not path.startswith(config.workspace_path)] > > - return oe.recipeutils.parse_recipe(recipefile, append_files, > > - tinfoil.config_data) > > - > > - > > def _ls_tree(directory): > > """Recursive listing of files in a directory""" > > ret = [] > > @@ -200,7 +172,7 @@ def extract(args, config, basepath, workspace): > > > > tinfoil = setup_tinfoil() > > > > - rd = _parse_recipe(config, tinfoil, args.recipename, True) > > + rd = parse_recipe(config, tinfoil, args.recipename, True) > > if not rd: > > return 1 > > > > @@ -420,7 +392,7 @@ def modify(args, config, basepath, workspace): > > > > tinfoil = setup_tinfoil() > > > > - rd = _parse_recipe(config, tinfoil, args.recipename, True) > > + rd = parse_recipe(config, tinfoil, args.recipename, True) > > if not rd: > > return 1 > > recipefile = rd.getVar('FILE', True) > > @@ -762,7 +734,7 @@ def update_recipe(args, config, basepath, workspace): > > > > tinfoil = setup_tinfoil() > > > > - rd = _parse_recipe(config, tinfoil, args.recipename, True) > > + rd = parse_recipe(config, tinfoil, args.recipename, True) > > if not rd: > > return 1 > > > > -- > > 2.1.4 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core