From: Collin Funk <collin.funk1@gmail.com>
Date: Sat, 13 Apr 2024 17:09:17 +0000 (-0700)
Subject: gnulib-tool.py: Fix extra arguments to function call.
X-Git-Tag: v1.0~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4e435f667b574268ebd2e67595a5316cfe2aa12;p=thirdparty%2Fgnulib.git

gnulib-tool.py: Fix extra arguments to function call.

* pygnulib/GLImport.py (GLImport.execute): Add the missing joinpath call
on two file name components before calling isfile().
---

diff --git a/ChangeLog b/ChangeLog
index a43b5cce15..4a5594c5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-04-13  Collin Funk  <collin.funk1@gmail.com>
+
+	gnulib-tool.py: Fix extra arguments to function call.
+	* pygnulib/GLImport.py (GLImport.execute): Add the missing joinpath call
+	on two file name components before calling isfile().
+
 2024-04-13  Bruno Haible  <bruno@clisp.org>
 
 	bootstrap: Fix --help messages.
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index d44ceedcec..eadf45828d 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1230,9 +1230,9 @@ 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)
+                else:  # if not isfile(joinpath(destdir, basename))
                     print('Create %s' % basename)
 
         # Create m4/gnulib-cache.m4.