On 2/21/24 5:55 PM, Bruno Haible wrote:
> Yes, please. But for long-time storage I'm not a fan of commit ids
> (I've seen too many packages move from one VCS to another VCS in the past...),
> but rather like in
> https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=948345cceab85ab699910a795d6b69ea2be6e300
> with the two first lines from the ChangeLog entry:
> 
>   Follow gnulib-tool change
>   <date and author of that commit>
>   <one-line summary of that commit>

Okay, here is a patch to make sure I am understanding correctly. Thanks
for the help. The GNU ChangeLog stuff is new too me. I left the commit
message without a part number. I wasn't sure if you wanted to continue
them/restart since all of them are your patches from ~2 years ago. Feel
free to add one if you would like and I'll see it before submitting another.

Thanks,
Collin
From f6051b9bb07b5474879f4f462984b8a1f02aa221 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Wed, 21 Feb 2024 21:32:10 -0800
Subject: [PATCH] gnulib-tool.py: Follow gnulib-tool changes.

Follow gnulib-tool change
2017-06-12 Bruno Haible <br...@clisp.org>
gnulib-tool: Clean up after autotools.

* pygnulib/GLTestDir.py (GLTestDir.execute): Remove
unnessecary autom4te.cache directory generated by Autotools.
(GLMegaTestDir.execute): Likewise.
---
 ChangeLog             | 10 ++++++++++
 gnulib-tool.py.TODO   | 11 -----------
 pygnulib/GLTestDir.py |  4 ++++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ab1246616..7862120eb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-02-21  Collin Funk  <collin.fu...@gmail.com>
+
+	gnulib-tool.py: Follow gnulib-tool changes.
+	Follow gnulib-tool change
+	2017-06-12 Bruno Haible <br...@clisp.org>
+	gnulib-tool: Clean up after autotools.
+	* pygnulib/GLTestDir.py (GLTestDir.execute): Remove
+	unnessecary autom4te.cache directory generated by Autotools.
+	(GLMegaTestDir.execute): Likewise.
+
 2024-02-21  Bruno Haible  <br...@clisp.org>
 
 	c-strtof: New module.
diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO
index da6df2ab90..1b4fe26cfc 100644
--- a/gnulib-tool.py.TODO
+++ b/gnulib-tool.py.TODO
@@ -818,17 +818,6 @@ Date:   Sun Oct 29 16:57:32 2017 +0100
 
 --------------------------------------------------------------------------------
 
-commit 87d14d357f694338acdb8745cea7304ff623ce47
-Author: Bruno Haible <br...@clisp.org>
-Date:   Mon Jun 12 01:38:57 2017 +0200
-
-    gnulib-tool: Clean up after autotools.
-
-    * gnulib-tool (func_create_testdir, func_create_megatestdir): Remove
-    useless directory left over by the Autotools.
-
---------------------------------------------------------------------------------
-
 commit 30459fe101541698ec704acb224946d73676750e
 Author: Bruno Haible <br...@clisp.org>
 Date:   Thu Jun 8 15:09:31 2017 +0200
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index 144798bd01..3bb99c59cc 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -21,6 +21,7 @@ import re
 import sys
 import codecs
 import subprocess as sp
+import shutil
 from . import constants
 from .GLError import GLError
 from .GLConfig import GLConfig
@@ -675,6 +676,7 @@ class GLTestDir(object):
         # automake
         args = [UTILS['automake'], '--add-missing', '--copy']
         constants.execute(args, verbose)
+        shutil.rmtree('autom4te.cache')
         os.chdir(DIRS['cwd'])
         if inctests and not single_configure:
             # Do not use "${AUTORECONF} --force --install", because it may invoke
@@ -705,6 +707,7 @@ class GLTestDir(object):
             # automake
             args = [UTILS['automake'], '--add-missing', '--copy']
             constants.execute(args, verbose)
+            shutil.rmtree('autom4te.cache')
             os.chdir(DIRS['cwd'])
 
         # Need to run configure and make once, to create built files that are to be
@@ -994,4 +997,5 @@ class GLMegaTestDir(object):
         constants.execute(args, verbose)
         args = [UTILS['automake'], '--add-missing', '--copy']
         constants.execute(args, verbose)
+        shutil.rmtree('autom4te.cache')
         sp.call(['rm', '-rf', self.config['tempdir']], shell=False)
-- 
2.39.2

Reply via email to