From patchwork Mon Jul 15 06:52:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerzy Grzegorek X-Patchwork-Id: 1131864 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.137; helo=fraxinus.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="QGDB8w3I"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45nDkh0vjzz9sND for ; Mon, 15 Jul 2019 16:53:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7708985CA3; Mon, 15 Jul 2019 06:53:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RhfoJPK8DeBd; Mon, 15 Jul 2019 06:53:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9CE8285C4B; Mon, 15 Jul 2019 06:53:07 +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 F35321BF47D for ; Mon, 15 Jul 2019 06:53:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EEBAC867C6 for ; Mon, 15 Jul 2019 06:53:05 +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 JcfgTZssEsBW for ; Mon, 15 Jul 2019 06:53:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2583785ADF for ; Mon, 15 Jul 2019 06:53:05 +0000 (UTC) Received: by mail-lj1-f171.google.com with SMTP id x25so15021914ljh.2 for ; Sun, 14 Jul 2019 23:53:04 -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; bh=H8lAhyCeac+y4t3VL4bD8jo/f1ccvVH7BoI3rT7ICew=; b=QGDB8w3IC1/vIJZ+SlVJnLlC/vHOIvD8lEI4Hl1WgXEwTGB1/avDl72QLkpfLjYy3u WmQKYC+tDGtDsq6v0gIN5xB86oUfpKvKGHIqENVp3Xq86fC8QBWOh8O6DB6tOejw1+FG w2S1t1kQ2NPxun54NPgNvgo8buF8cESo2MUGpa5uR4ZGiWiwWUWF4khz9NdwNlawKQpa cPxueZvf/MQnLqwstvlDnA4XTSOt/U1ydfoo0M/ZUfCphAZBrq5UgSL8Tm210sWIgBgN Xb9KJFc3ZfoeEEiNNUWZGQvpxX6fFKrVxgFoH8DC1rJg1BUP1DQtfUYhAn/5W6BiOtjm X4MQ== 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; bh=H8lAhyCeac+y4t3VL4bD8jo/f1ccvVH7BoI3rT7ICew=; b=SznMLQUpZws/O8EB6ZnHRP5uN9H64jgp/6wwgYR7Kca6dKyiNLNsfVvA0kOGwcA0vo Xyi4azl+Hk1/8i/UpmlOTuCHeDp2GtfKZ0xTq9m6RsJJlxzPLHboKo9E3B4dReqz7kJV VYTo4OJ2sFWEcw4H/BuCwQllb0t5MRMteowPrYfgHk5NgaUJB7ov5AqDLL9DlGw2GKtk NM66tWd3OhCIhr6g2S7BUBEflp+zmKAVOw3nRttm+UZW/xPJ1gxLgK95O3zUeM8Cwm/p Ma4S6t8dIVFHljJV0ArqrtE2azeHKkii/C+QdUlYBY+Ml7I1osgkz8RfR8MjvjlThfFh /i2Q== X-Gm-Message-State: APjAAAXCzWbyqC31UU0IHgdSAGpZKlyANergU6QotfLUd43D/gPeopCx oAS6AJEd0jiAiSVIk+kfm02w75DqnTY= X-Google-Smtp-Source: APXvYqzCikD5CJGiWu9uPmtok2Db5dxY5vlp84lxEQb78T8KW2vOcEmvHw3QhF0qBmOcGsw75AvSOA== X-Received: by 2002:a2e:a0d6:: with SMTP id f22mr12683113ljm.182.1563173582641; Sun, 14 Jul 2019 23:53:02 -0700 (PDT) Received: from localhost.localdomain (user-5-173-251-168.play-internet.pl. [5.173.251.168]) by smtp.gmail.com with ESMTPSA id y4sm2197838lfc.56.2019.07.14.23.53.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 14 Jul 2019 23:53:01 -0700 (PDT) From: Jerzy Grzegorek To: buildroot@busybox.net Date: Mon, 15 Jul 2019 08:52:53 +0200 Message-Id: <20190715065253.6072-1-jerzy.m.grzegorek@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/1] utils/checkpackagelib: CommentsMenusPackagesOrder: fix order of packages checking 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" Signed-off-by: Jerzy Grzegorek --- utils/checkpackagelib/lib_config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index f0edb9993d..a135355f9a 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -72,8 +72,8 @@ class CommentsMenusPackagesOrder(_CheckFunction): return len(self.state.split('-')) - 1 def check_line(self, lineno, text): - if text.startswith("comment") or text.startswith("if") or \ - text.startswith("menu"): + if text.startswith("comment ") or text.startswith("if ") or \ + text.startswith("menu "): if text.startswith("comment"): if not self.state.endswith("-comment"): @@ -103,7 +103,7 @@ class CommentsMenusPackagesOrder(_CheckFunction): elif text.startswith('\tsource "package/'): level = self.get_level() - new_package = text[17: -(len(self.filename)-5):] + new_package = text[17: -(len(self.filename)-self.filename.index("Config")+3):] # We order _ before A, so replace it with . new_package_ord = new_package.replace('_', '.')