From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 713DAE00B7D; Thu, 1 Jun 2017 23:28:54 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, * medium trust * [147.11.146.13 listed in list.dnswl.org] Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 0D1F4E00B63 for ; Thu, 1 Jun 2017 23:28:51 -0700 (PDT) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id v526Soxq020446 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Thu, 1 Jun 2017 23:28:50 -0700 (PDT) Received: from ala-blade47.wrs.com (147.11.105.67) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.294.0; Thu, 1 Jun 2017 23:28:50 -0700 From: Robert Yang To: Date: Thu, 1 Jun 2017 23:28:38 -0700 Message-ID: <6a6dda61db782fd8394aad973a0e0e465072c2f5.1496384657.git.liezhi.yang@windriver.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: MIME-Version: 1.0 Cc: Konrad.Scherer@windriver.com, paul.eggleton@linux.intel.com Subject: [PATCH V3 01/11] layerconfparse.py: remove unused layerbranch from parse_layer() X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2017 06:28:54 -0000 Content-Type: text/plain The layerbranch is not used in parse_layer(), so remove it. Signed-off-by: Robert Yang --- layerindex/layerconfparse.py | 2 +- layerindex/tools/import_layer.py | 2 +- layerindex/update_layer.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layerindex/layerconfparse.py b/layerindex/layerconfparse.py index d599ed5..526d2c2 100644 --- a/layerindex/layerconfparse.py +++ b/layerindex/layerconfparse.py @@ -32,7 +32,7 @@ class LayerConfParse: self.config_data_copy = bb.data.createCopy(self.tinfoil.config_data) - def parse_layer(self, layerbranch, layerdir): + def parse_layer(self, layerdir): # This is not a valid layer, parsing will cause exception. if not utils.is_layer_valid(layerdir): diff --git a/layerindex/tools/import_layer.py b/layerindex/tools/import_layer.py index ad16e40..a806dd1 100755 --- a/layerindex/tools/import_layer.py +++ b/layerindex/tools/import_layer.py @@ -377,7 +377,7 @@ def main(): layerdep.save() layerconfparser = LayerConfParse(logger=logger) try: - config_data = layerconfparser.parse_layer(layerbranch, layerdir) + config_data = layerconfparser.parse_layer(layerdir) if config_data: utils.add_dependencies(layerbranch, config_data, logger=logger) utils.add_recommends(layerbranch, config_data, logger=logger) diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 9fe96fb..05ab3e7 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -267,7 +267,7 @@ def main(): sys.exit(0) layerconfparser = layerconfparse.LayerConfParse(logger=logger, bitbakepath=bitbakepath, tinfoil=tinfoil) - config_data = layerconfparser.parse_layer(layerbranch, layerdir) + config_data = layerconfparser.parse_layer(layerdir) if not config_data: logger.debug("Layer %s does not appear to be valid for branch %s" % (layer.name, branchdesc)) sys.exit(0) @@ -355,7 +355,7 @@ def main(): logger.info("Collecting data for layer %s on branch %s" % (layer.name, branchdesc)) layerconfparser = layerconfparse.LayerConfParse(logger=logger, tinfoil=tinfoil) - layer_config_data = layerconfparser.parse_layer(layerbranch, layerdir) + layer_config_data = layerconfparser.parse_layer(layerdir) if not layer_config_data: logger.info("Skipping update of layer %s for branch %s - conf/layer.conf may have parse issues" % (layer.name, branchdesc)) layerconfparser.shutdown() -- 2.10.2