From patchwork Tue Sep 3 21:13:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1157309 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mlU74yfv"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46NKSs0mnQz9s4Y for ; Wed, 4 Sep 2019 07:14:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DC8F181D66; Tue, 3 Sep 2019 21:13:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LD+6CPTYDjKu; Tue, 3 Sep 2019 21:13:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E0B187797; Tue, 3 Sep 2019 21:13:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 554AE1BF59D for ; Tue, 3 Sep 2019 21:13:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 526A38284B for ; Tue, 3 Sep 2019 21:13:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XeV4B1iXYmUn for ; Tue, 3 Sep 2019 21:13:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id D3F2F81F70 for ; Tue, 3 Sep 2019 21:13:54 +0000 (UTC) Received: by mail-lf1-f49.google.com with SMTP id z21so14094040lfe.1 for ; Tue, 03 Sep 2019 14:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4pyW4Jkaegy08rUt4Ppp++wpM9kA6Js5BZhY1xTJASI=; b=mlU74yfvvuvZ4CaUlJm6tijwth7Z4A1z12XVA8aJFjb0oYz7gW3UMrgwcFtRg9Fcdt MTIs2m0sxw5PCtvWnvbgx/UsAxpLbkaLixGy09MwswCqkBX3nXdlXyVQ4ykMQQO8CqiI M/XEgacwswey+brWsemqKTRxo0YMfjvpG7heUthwDcs7xvyqMpJrm2KFZZgg5C//19WD NKDsU1TSKRxYmm2Aaw89gFpZhFeP0eDVJFPk9KZReFdzTYD5dNhczMKczySRmV12V/NQ Ff6xr0Px+gAytKeHkTE+GSldbWSDEyXyo7hHgFh0NMuFkvidc9CBWKHsf7L2vgcrV72Z AX0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4pyW4Jkaegy08rUt4Ppp++wpM9kA6Js5BZhY1xTJASI=; b=crjurTE8OIHdka1mfJpZH7MeWphM8vZlyhC+l3tAnMOnOUui9yFIBkQt7wnuALWP3r DYT/nusC63cZQY0mm/LfZyHbI5mquyhNTvPHopWLXdmiOZP0WtCmGkv8jAIZWCPAwvIl aEjlvPbdBiOTdidp4q7x22wMtdBlotb25mPS8diYjLeAEtYZGyUsqaMWvGjez78SReGp Txt36g/8PQA7JDqR1wiqWEGFQfk7bddHQnfBzMyLrXUlEer+c+d/uVe7v4rcs0zI9AX2 LEhfAv30eRK5ovBWIvOOVmiBN4JfWiHndjbZ+ls5U6sbzHLaDPDMobyWiLYIFTaj8bEO EiTw== X-Gm-Message-State: APjAAAWZoXviuvR4Men/7oZljs0Ybs2VxjIucLkmKPubHNP5SQkabKXv n7AUwWgpY/FdI8oB+B2jQrG4t8xGl4w= X-Google-Smtp-Source: APXvYqzZ63nACohmDUeS46MYO51U2qtA6DPtlp18izJCObdmHSCjSb4vV9UpOjIxr4VvHuOM+WYVWA== X-Received: by 2002:ac2:5297:: with SMTP id q23mr15217843lfm.78.1567545232973; Tue, 03 Sep 2019 14:13:52 -0700 (PDT) Received: from localhost.localdomain (user-5-173-240-120.play-internet.pl. [5.173.240.120]) by smtp.gmail.com with ESMTPSA id u1sm1650822lfi.83.2019.09.03.14.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 14:13:52 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Tue, 3 Sep 2019 23:13:26 +0200 Message-Id: <20190903211341.10341-3-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> References: <20190903211341.10341-1-jerzy.m.grzegorek@gmail.com> Subject: [Buildroot] [PATCH 03/18] checkpackagelib/lib_config.py: CommentsMenusPackagesOrder: get value of variable 'level' X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jerzy Grzegorek MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Get value of variable 'level' only just after the state change. Signed-off-by: Jerzy Grzegorek Cc: Arnout Vandecappelle (Essensium/Mind) --- utils/checkpackagelib/lib_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index 8fad36f5ac..e6a5f1b182 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -114,8 +114,9 @@ class CommentsMenusPackagesOrder(_CheckFunction): elif text.startswith("endmenu"): self.state = self.state[:-5] - elif source_line: self.level = self.get_level() + + elif source_line: new_package = source_line.group(1) # We order _ before A, so replace it with .