From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on starla X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 065541F44D for ; Sat, 13 Apr 2024 17:13:18 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Mqp1lHLo; dkim-atps=neutral Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvgvu-0007Jd-R5; Sat, 13 Apr 2024 13:12:54 -0400 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 1rvgvs-0007J2-Vu for bug-gnulib@gnu.org; Sat, 13 Apr 2024 13:12:53 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvgvr-0007eA-0y for bug-gnulib@gnu.org; Sat, 13 Apr 2024 13:12:52 -0400 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2a2e5d86254so1927791a91.1 for ; Sat, 13 Apr 2024 10:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713028368; x=1713633168; darn=gnu.org; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=/vX2MCxWKvpxA8eIJJBQzZ8/dCqDbHlXFTxBtg8Zk+U=; b=Mqp1lHLoplv7DxW0WJ7VAjJa6zByvYegwjBxIWoqj7K4uRdONGAvPWKnN5AvZm4vEY EmEznnU5ZkoiQqA9d0Lv6x08lfzwtKrDiD+XWqZP2vzvf8j4D/+25pHa639giNiQbS5c dOO3VgPnZ80z+kJrqBkmkOUJyXhlrlBmvXe4x99HNNCsSDYAVjxML/DBUETy3eEsa+7l mYOhoGY9rPdZ9nPJLfWE8kYzMpYMBB/9deMuLB+NRLs+8pcLf8yKs3vcfmlVdx2Vc7+1 EhKvx4YNotNrCZb5uN16HyRlQ7brOZ+fvaQOvUJ35JBBUUm73dGLNN2kk9lDduiRVDmz FCSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713028368; x=1713633168; h=subject:from:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/vX2MCxWKvpxA8eIJJBQzZ8/dCqDbHlXFTxBtg8Zk+U=; b=nb2GRfktKi2w1l7aJVc7azWz+uJAogAiixAYdWHACv8KB8ZZxQBMNZqzYmICU8hCsx IW/fiVsGYkDDdoe+kxU0UfGD0ZhdYlED5o7IGu5XEhAOaIcgsTg1zq1FsjQPxYw5X5j2 KG50fq/84lxqMZ3MtXaQSgxd9Ez50BuqkJTPMiE/b4kjLDURJyFFhIjQjt8MyJnYuQDY IvNcGtP+7kTJ/qAMRV4BRjphGJUfMRgLVPrzK5/vtusqy8mFy+mxams+iIHIq6XBa0xa dDykgpM6B7KlM3AtjC22z9bxeHOPm8F12EwQJjUjyCAf+kUDmrNNJ/G89D1GvkWlo29l 073A== X-Gm-Message-State: AOJu0YxbWNScnY5TVD/uLPRy66N5S4NawYN/x4poz80hDIwWav2uJAdr fTZ+2x4lhvX+lZiIovgXFdrGFcHAlNpteKDT0FsCJF2Zqv06XZQUqFlb4A== X-Google-Smtp-Source: AGHT+IFKeo1vFzRJ9aBM2CIQLYKUpduIkcPpgOCybjblNfiY+doAwJOC6A5n3fSEAtZhi7NltLK5uQ== X-Received: by 2002:a17:90a:398c:b0:2a2:d05c:95f6 with SMTP id z12-20020a17090a398c00b002a2d05c95f6mr11946002pjb.7.1713028368168; Sat, 13 Apr 2024 10:12:48 -0700 (PDT) Received: from [192.168.1.5] (c-73-189-213-139.hsd1.ca.comcast.net. [73.189.213.139]) by smtp.gmail.com with ESMTPSA id m13-20020a17090aab0d00b002a54632931bsm6120503pjq.23.2024.04.13.10.12.46 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Apr 2024 10:12:47 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------fATKSxjxfQJxqsXqSCwE6ZQw" Message-ID: Date: Sat, 13 Apr 2024 10:12:45 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: bug-gnulib@gnu.org From: Collin Funk Subject: gnulib-tool.py: Fix extra arguments to function call. Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=collin.funk1@gmail.com; helo=mail-pj1-x1036.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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: bug-gnulib@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org This is a multi-part message in MIME format. --------------fATKSxjxfQJxqsXqSCwE6ZQw Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit I see a warning for this section of code because isfile() is called with two arguments. It looks like the correct way to write this is to joinpath() the two arguments, since that is what is done in self.assistant.super_update() when not self.config['dryrun']. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index d44ceedcec..098bbc59ac 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -1230,7 +1230,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix os.remove(tmpfile) else: # if not self.config['dryrun'] backupname = '%s~' % basename - if isfile(destdir, basename): + if isfile(joinpath(destdir, basename)): print('Update %s (backup in %s)' % (basename, backupname)) else: # if not isfile(destdir, basename) print('Create %s' % basename) Collin --------------fATKSxjxfQJxqsXqSCwE6ZQw Content-Type: text/x-patch; charset=UTF-8; name="0001-gnulib-tool.py-Fix-extra-arguments-to-function-call.patch" Content-Disposition: attachment; filename*0="0001-gnulib-tool.py-Fix-extra-arguments-to-function-call.pat"; filename*1="ch" Content-Transfer-Encoding: base64 RnJvbSBmMDk5MDU5MGI2MmYwYTVlMTg5NzA2NDNhYzMxYzk2N2I0YTVmMTlkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBDb2xsaW4gRnVuayA8Y29sbGluLmZ1bmsxQGdtYWls LmNvbT4KRGF0ZTogU2F0LCAxMyBBcHIgMjAyNCAxMDowOToxNyAtMDcwMApTdWJqZWN0OiBb UEFUQ0hdIGdudWxpYi10b29sLnB5OiBGaXggZXh0cmEgYXJndW1lbnRzIHRvIGZ1bmN0aW9u IGNhbGwuCgoqIHB5Z251bGliL0dMSW1wb3J0LnB5IChHTEltcG9ydC5leGVjdXRlKTogQWRk IHRoZSBtaXNzaW5nIGpvaW5wYXRoIGNhbGwKb24gdHdvIGZpbGUgbmFtZSBjb21wb25lbnRz IGJlZm9yZSBjYWxsaW5nIGlzZmlsZSgpLgotLS0KIENoYW5nZUxvZyAgICAgICAgICAgIHwg NiArKysrKysKIHB5Z251bGliL0dMSW1wb3J0LnB5IHwgMiArLQogMiBmaWxlcyBjaGFuZ2Vk LCA3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9DaGFuZ2VM b2cgYi9DaGFuZ2VMb2cKaW5kZXggYzcyMTY1ZTI2OC4uZDY1NTk1MTIyYyAxMDA2NDQKLS0t IGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDkgQEAKKzIwMjQtMDQt MTMgIENvbGxpbiBGdW5rICA8Y29sbGluLmZ1bmsxQGdtYWlsLmNvbT4KKworCWdudWxpYi10 b29sLnB5OiBGaXggZXh0cmEgYXJndW1lbnRzIHRvIGZ1bmN0aW9uIGNhbGwuCisJKiBweWdu dWxpYi9HTEltcG9ydC5weSAoR0xJbXBvcnQuZXhlY3V0ZSk6IEFkZCB0aGUgbWlzc2luZyBq b2lucGF0aCBjYWxsCisJb24gdHdvIGZpbGUgbmFtZSBjb21wb25lbnRzIGJlZm9yZSBjYWxs aW5nIGlzZmlsZSgpLgorCiAyMDI0LTA0LTEzICBCcnVubyBIYWlibGUgIDxicnVub0BjbGlz cC5vcmc+CiAKIAlnbnVsaWItdG9vbC5weTogQ29kZSB0d2Vhay4KZGlmZiAtLWdpdCBhL3B5 Z251bGliL0dMSW1wb3J0LnB5IGIvcHlnbnVsaWIvR0xJbXBvcnQucHkKaW5kZXggZDQ0Y2Vl ZGNlYy4uMDk4YmJjNTlhYyAxMDA2NDQKLS0tIGEvcHlnbnVsaWIvR0xJbXBvcnQucHkKKysr IGIvcHlnbnVsaWIvR0xJbXBvcnQucHkKQEAgLTEyMzAsNyArMTIzMCw3IEBAIEFDX0RFRlVO KFslc19GSUxFX0xJU1RdLCBbXG4nJycgJSBtYWNyb19wcmVmaXgKICAgICAgICAgICAgICAg ICAgICAgb3MucmVtb3ZlKHRtcGZpbGUpCiAgICAgICAgICAgICBlbHNlOiAgIyBpZiBub3Qg c2VsZi5jb25maWdbJ2RyeXJ1biddCiAgICAgICAgICAgICAgICAgYmFja3VwbmFtZSA9ICcl c34nICUgYmFzZW5hbWUKLSAgICAgICAgICAgICAgICBpZiBpc2ZpbGUoZGVzdGRpciwgYmFz ZW5hbWUpOgorICAgICAgICAgICAgICAgIGlmIGlzZmlsZShqb2lucGF0aChkZXN0ZGlyLCBi YXNlbmFtZSkpOgogICAgICAgICAgICAgICAgICAgICBwcmludCgnVXBkYXRlICVzIChiYWNr dXAgaW4gJXMpJyAlIChiYXNlbmFtZSwgYmFja3VwbmFtZSkpCiAgICAgICAgICAgICAgICAg ZWxzZTogICMgaWYgbm90IGlzZmlsZShkZXN0ZGlyLCBiYXNlbmFtZSkKICAgICAgICAgICAg ICAgICAgICAgcHJpbnQoJ0NyZWF0ZSAlcycgJSBiYXNlbmFtZSkKLS0gCjIuNDQuMAoK --------------fATKSxjxfQJxqsXqSCwE6ZQw--