From patchwork Sat Dec 17 01:45:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45385 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D35B327BBED; Sat, 17 Dec 2022 01:46:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 53B0A27BBEB for ; Sat, 17 Dec 2022 01:46:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6MHF-0006zk-O7; Fri, 16 Dec 2022 20:46:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6MH9-0006z8-V1 for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6MH4-0001XK-Mw for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6MH4-0003k7-Iq for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60132] [PATCH 1/3] patman: remove extraneous imports Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Dec 2022 01:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60132 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60132@debbugs.gnu.org Cc: u-boot@lists.denx.de, Simon Glass , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167124154414335 (code B ref -1); Sat, 17 Dec 2022 01:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2022 01:45:44 +0000 Received: from localhost ([127.0.0.1]:52863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6MGl-0003j9-L2 for submit@debbugs.gnu.org; Fri, 16 Dec 2022 20:45:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:34228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6MGk-0003j3-4s for submit@debbugs.gnu.org; Fri, 16 Dec 2022 20:45:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6MGj-0006wA-TM for guix-patches@gnu.org; Fri, 16 Dec 2022 20:45:41 -0500 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6MGi-0001UR-69 for guix-patches@gnu.org; Fri, 16 Dec 2022 20:45:41 -0500 Received: by mail-qv1-xf2d.google.com with SMTP id d13so2763145qvj.8 for ; Fri, 16 Dec 2022 17:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7lGLS0O0pZz3EPNgdgewPcXIsasK+WPe7TsptLOltGg=; b=FFWnrz+xN17MuvvPqA0yb7Kvi2Zj6IIxUuatDajHAVCBh6/gOzraLBRMB+dSDwkg6C tFvtjd7d1I0WVIUw00dnYz1+5/P3sMXk15rCqV3pZ3DT3DNjWMGU9cTFIXhf3zEYLBgx iXs9LLZV6th1OwP3UIIl4BeUYK9YEil/O6QluPd9vjnFsO8RlaUo+m2HP0fBuUP9sZfd pLG2e/ww24AaUwryawUYgJuRyutKDv/EF5IYCEqQKlndvr0wP0OFSp/iPuvTnCisOMVk R31qAGm8PhYwiU6se5NpGbHVTO1rC70C6uWp/d9TD5H7MNN3mW85+TEjMTxN5aXu4tuv RSqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7lGLS0O0pZz3EPNgdgewPcXIsasK+WPe7TsptLOltGg=; b=TPrvD4Xx/9WFQnHOBSCE7NYXk00PRDloYCCgCb02CjlAHaOHo5jkwmXQK6AWL17nNu xxdWaBFtJEqJETtyxRMM70ZsU1M3vviWUComfc9lmoZrUTXevZeyy9hAzxZqASIzec+F +mWu2qkHDtKpDpRW8PJpDLVLPMh34yyNUNDOnaPkGuWGg8/TcQ6HjgO4vBHAt1g3wCRL L2aoz0MJurPJYUAwCEhIG+penF+XkR/GsN0xMhE+fwudCSD9jcHcS7gVqBZvlRTeJfQv fEGzUI6eApB/Wi95dbePo94TtqDtYNvd5fzbDsuTZx6b3XIe9jG+/xdGXBQc+xKzREqO XqAQ== X-Gm-Message-State: ANoB5pl6HO9zKHOBcI1PHArKVnmlkPXvaEecbHFv313EkCh0oeQxDn3L h42TXm04d0M9pl3FAg4BFCU2qXeQ/Lfl3TYU X-Google-Smtp-Source: AA0mqf77h4+GofrKuOAQlGFtLpv65tvYXT7AXCP9q3NpEPFL4hjF6PiT8MbTMK65gkxB8elxuZyUEg== X-Received: by 2002:a0c:c30d:0:b0:4c7:4e21:d32b with SMTP id f13-20020a0cc30d000000b004c74e21d32bmr46766726qvi.11.1671241538029; Fri, 16 Dec 2022 17:45:38 -0800 (PST) Received: from localhost.localdomain (dsl-159-157.b2b2c.ca. [66.158.159.157]) by smtp.gmail.com with ESMTPSA id y18-20020a37f612000000b006fefa5f7fcesm2674474qkj.10.2022.12.16.17.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 17:45:37 -0800 (PST) From: Maxim Cournoyer X-Google-Original-From: Maxim Cournoyer Date: Fri, 16 Dec 2022 20:45:27 -0500 Message-Id: <20221217014530.27772-1-maxim.cournoyer@savoirfairelinux.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2d; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf2d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * tools/patman/main.py: Remove extraneous imports and fix indentation. Signed-off-by: Maxim Cournoyer Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- tools/patman/main.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) base-commit: 9bd3d354a1a0712ac27c717df9ad60566b0406ee diff --git a/tools/patman/main.py b/tools/patman/main.py index 5a7756a221..8067a288ab 100755 --- a/tools/patman/main.py +++ b/tools/patman/main.py @@ -9,7 +9,6 @@ from argparse import ArgumentParser import os import re -import shutil import sys import traceback @@ -19,7 +18,6 @@ if __name__ == "__main__": sys.path.append(os.path.join(our_path, '..')) # Our modules -from patman import command from patman import control from patman import gitutil from patman import project @@ -136,7 +134,6 @@ if not args.debug: # Run our meagre tests if args.cmd == 'test': - import doctest from patman import func_test result = test_util.run_test_suites( @@ -183,7 +180,7 @@ elif args.cmd == 'status': args.show_comments, args.patchwork_url) except Exception as e: terminal.tprint('patman: %s: %s' % (type(e).__name__, e), - colour=terminal.Color.RED) + colour=terminal.Color.RED) if args.debug: print() traceback.print_exc() From patchwork Sat Dec 17 01:45:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45383 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B6E5927BBEB; Sat, 17 Dec 2022 01:46:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA7D427BBE9 for ; Sat, 17 Dec 2022 01:46:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6MHE-0006zj-FE; Fri, 16 Dec 2022 20:46:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6MH9-0006z6-VL for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6MH5-0001XN-Cx for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6MH5-0003kS-8D for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60133] [PATCH 2/3] patman: fix installation of README.rst data file Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Dec 2022 01:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60133 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60133@debbugs.gnu.org Cc: u-boot@lists.denx.de, Simon Glass , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167124155014354 (code B ref -1); Sat, 17 Dec 2022 01:46:03 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2022 01:45:50 +0000 Received: from localhost ([127.0.0.1]:52868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6MGs-0003jS-0C for submit@debbugs.gnu.org; Fri, 16 Dec 2022 20:45:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:38632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6MGq-0003jM-0i for submit@debbugs.gnu.org; Fri, 16 Dec 2022 20:45:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6MGp-0006wb-9H for guix-patches@gnu.org; Fri, 16 Dec 2022 20:45:47 -0500 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6MGn-0001Ut-QI for guix-patches@gnu.org; Fri, 16 Dec 2022 20:45:47 -0500 Received: by mail-qt1-x832.google.com with SMTP id bw27so2059074qtb.3 for ; Fri, 16 Dec 2022 17:45:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8ou4+c4kX5EZNxNC3H5j3No+tpTWvHoleYQSB2Hqsm4=; b=lPGZ2bgDL7pRCFfLNio3O4CfC70rp3eynNEXMmty71YwVgNrKiJ07+biUteWIR85t0 0hrCeZ9Gq63yQ8o3iytB/Os0Bgi6JPKzlTadQqnyGLbFhgG9+5LZbslh7xe3bOUhOCiw XiWxTMVYaOLc8l9XiY+RVLtc/WrdFqevv30QiNrIl9FCreOz7aGi0K0HdkAE+YeGD4/d /Mn1kOCMNv9ToXfaSztSDIja6g22OvKhPi12Z1aWsEoFAJzfg2BGKTn0rEDHPd2ONTOg gGcvYjzEPvCeo93z4dnk81/KWWph5wGtmgiCgPISqxDAImebefoMuUunoaxbqOokMiha a+Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8ou4+c4kX5EZNxNC3H5j3No+tpTWvHoleYQSB2Hqsm4=; b=MBTAHDxTtGXQqjnL/ZenwpZfaov2qZNgHho0Q5Pkr3+n/aBqm01oDHfxMj9LMC6nM7 7Xi+tjKty9fe/CXzR5NQC0sC3aJs/gUhOv6GBc7z1KBJDk/WXwomk8Tcs/E2n58EC6r8 8pOyd9mxV61PAMs3LzsHMUUMDTA5FDY5xWlPbxeWdLzMsLCzFfRiFucgntGDDerGKdON UfuH7jXmRn5PNnYfJrIoEzVo3M3UTsHEYhTymiFgOPUFDrR3yZvRCpUrmM9WF3vFI9WM UsUu+IMkAuNq9+uXPMFVLnKQKaptXg+2BOgiXpdP1Sek92Q9PZJsnUHcEww5vtlW6kvB c1xA== X-Gm-Message-State: AFqh2ko9rTJTuyptvv+ZfXFavSV9FxO71s02RDPMAv6P6ubkFFFrYNAF wDYVKYKsWXSVowW7dfetFSfEYrInU/kS0OEj X-Google-Smtp-Source: AMrXdXsWZ+BbHzHJfwAJGt7YerlwgSOqLXmCN8zqmOgqkEuvk8AJ3z9ZDkF3DMpiGgAP1KSpQgrqLw== X-Received: by 2002:a05:622a:2446:b0:3a5:fba4:96cf with SMTP id bl6-20020a05622a244600b003a5fba496cfmr2052485qtb.9.1671241544097; Fri, 16 Dec 2022 17:45:44 -0800 (PST) Received: from localhost.localdomain (dsl-159-157.b2b2c.ca. [66.158.159.157]) by smtp.gmail.com with ESMTPSA id y18-20020a37f612000000b006fefa5f7fcesm2674474qkj.10.2022.12.16.17.45.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 17:45:43 -0800 (PST) From: Maxim Cournoyer X-Google-Original-From: Maxim Cournoyer Date: Fri, 16 Dec 2022 20:45:28 -0500 Message-Id: <20221217014530.27772-2-maxim.cournoyer@savoirfairelinux.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217014530.27772-1-maxim.cournoyer@savoirfairelinux.com> References: <20221217014530.27772-1-maxim.cournoyer@savoirfairelinux.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::832; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x832.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes a regression introduced in commit 74df491051d6 ("buildman: Convert documentation to rST"). Signed-off-by: Maxim Cournoyer Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- tools/patman/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patman/setup.py b/tools/patman/setup.py index 43fdc00ce6..ce9bb4aa63 100644 --- a/tools/patman/setup.py +++ b/tools/patman/setup.py @@ -7,6 +7,6 @@ setup(name='patman', scripts=['patman'], packages=['patman'], package_dir={'patman': ''}, - package_data={'patman': ['README']}, + package_data={'patman': ['README.rst']}, classifiers=['Environment :: Console', 'Topic :: Software Development']) From patchwork Sat Dec 17 01:45:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45384 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1CA5927BBEB; Sat, 17 Dec 2022 01:46:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 43CC127BBE9 for ; Sat, 17 Dec 2022 01:46:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6MHV-00071r-0e; Fri, 16 Dec 2022 20:46:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6MH9-0006z7-VZ for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6MH6-0001XO-6t for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6MH5-0003kg-WE for guix-patches@gnu.org; Fri, 16 Dec 2022 20:46:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60134] [PATCH 3/3] patman: locate README.rst via importlib Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Dec 2022 01:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60134 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60134@debbugs.gnu.org Cc: u-boot@lists.denx.de, Simon Glass , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167124155514368 (code B ref -1); Sat, 17 Dec 2022 01:46:03 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2022 01:45:55 +0000 Received: from localhost ([127.0.0.1]:52871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6MGx-0003jf-9B for submit@debbugs.gnu.org; Fri, 16 Dec 2022 20:45:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:51188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6MGv-0003jZ-3B for submit@debbugs.gnu.org; Fri, 16 Dec 2022 20:45:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6MGu-0006yg-Hz for guix-patches@gnu.org; Fri, 16 Dec 2022 20:45:52 -0500 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6MGt-0001Vb-1l for guix-patches@gnu.org; Fri, 16 Dec 2022 20:45:52 -0500 Received: by mail-qv1-xf34.google.com with SMTP id c14so2806732qvq.0 for ; Fri, 16 Dec 2022 17:45:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0TAPHjYtmiMb5t9m1jhtdilE6atVeg32azDAomj+VWc=; b=MLSCNBjvNfm2jRqQMQemd9/vOsdECbGTybqpJwpiFpor+lBPF/VKgbUbrzQwvXePfG EpZINiMr8B15C95MYR0Y07E3xw6fsomw7pKKOWbXon6fUo3dWTPPfvA8C2Okpp4iBrQV 4y6ODzmUl+BscjG/q5uz1j56palTAHuN2tx+YfuGNi9MWO9EmcD6zfZjohiiCNDZuP/9 qS7kAfdspzpRA7cOBjTzswl3aLN382pA4Fe8zqNg1ri4TVJB4VRWrVT242DoYC6bL1nz NXXsX9n1XJCvBFd2e+NXJPYAXXAD+qo53IL9NvV0T1iG0U3pj1rI4Lu1Qh1o4eVpGwUm FXyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0TAPHjYtmiMb5t9m1jhtdilE6atVeg32azDAomj+VWc=; b=xbY8ldGfZPP0cEa3Y2FCNCW1sH9AF9mbjNseDA0am2+cGoWSM8FeC9vTctOpuDW1nm OhFanoNjoucsXW4p01CVNQ7E4ON4UkbXxM85KlFmlFMmhC94Ly9gFDzy48MJ0N5izaq2 UK9VrW76tOl4W26eIeVsKN0uS7HSsMUC0j7CWjX1DodECqiaQ87QGkiK6hQHq3RJKyQz EsJskQoL94WIkGzKlFAcr3ie6SgYmotzyBMDmTPmLCdJ5Z3x5GRXJstaSziAvbkrKL4y 9yAJ1gmYvo+5cYN03vVv70v+jlMJ/BCYG7BhpzJO7JKx1qNzO6YpQF4Qk4LIhYAsvW8K sS3w== X-Gm-Message-State: AFqh2kq8OElRCM7NUCebvuIPkG3MlBPxnQfCnw0BTDKc5fgxoYbEFpyR b8hipTh3CJ6RolqNDtLDt7UbfGVo+KcvN7IY X-Google-Smtp-Source: AMrXdXtWR9MpPxDYrAWwnyE0kgKknhOOM7rUJ1E2qKLnjekgpVwHB1W83ckw4PNZp1q1J+nvhSclPQ== X-Received: by 2002:a0c:f703:0:b0:4c7:61c0:669d with SMTP id w3-20020a0cf703000000b004c761c0669dmr664346qvn.20.1671241549875; Fri, 16 Dec 2022 17:45:49 -0800 (PST) Received: from localhost.localdomain (dsl-159-157.b2b2c.ca. [66.158.159.157]) by smtp.gmail.com with ESMTPSA id y18-20020a37f612000000b006fefa5f7fcesm2674474qkj.10.2022.12.16.17.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 17:45:49 -0800 (PST) From: Maxim Cournoyer X-Google-Original-From: Maxim Cournoyer Date: Fri, 16 Dec 2022 20:45:29 -0500 Message-Id: <20221217014530.27772-3-maxim.cournoyer@savoirfairelinux.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217014530.27772-1-maxim.cournoyer@savoirfairelinux.com> References: <20221217014530.27772-1-maxim.cournoyer@savoirfairelinux.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f34; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf34.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Rationale: this is more robust than assumptions about the file hierarchy layout of the installation of patman, for example on non file-hierarchy standard (FHS) systems such as Guix System or Nix OS. Signed-off-by: Maxim Cournoyer Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- tools/patman/main.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/patman/main.py b/tools/patman/main.py index 8067a288ab..2a2a7eaa24 100755 --- a/tools/patman/main.py +++ b/tools/patman/main.py @@ -7,6 +7,7 @@ """See README for more information""" from argparse import ArgumentParser +import importlib.resources import os import re import sys @@ -160,11 +161,8 @@ elif args.cmd == 'send': fd.close() elif args.full_help: - tools.print_full_help( - os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), - 'README.rst') - ) - + with importlib.resources.path('patman', 'README.rst') as readme: + tools.print_full_help(str(readme)) else: # If we are not processing tags, no need to warning about bad ones if not args.process_tags: