Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-28 Thread Bruno Haible
Collin Funk wrote: > I've also removed the sorted() calls in actioncmd. The sorting in > __init__ works correctly so gnulib-tool and gnulib-tool.py output the > same actioncmd (at least with Emacs' merge-gnulib). Thanks for following up on this. The patch looks good. Applied. Bruno

Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-28 Thread Collin Funk
On 2/26/24 12:51 PM, Bruno Haible wrote: > Well, GLConfig applies to all modes (not just 'import', but also > 'create-testdir' etc.). Since on the bash side, you found that the > sorting is specifically in the func_import(), the right place to do it > is in GLImport.py, not GLConfig.py. I think th

Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-26 Thread Bruno Haible
Hi Collin, > From what I could understand, it seems that upon seeing that the mode > is "import", the specified_modules is set with the unsorted list of > modules [1]. Then that variable is sorted before it is used [2]. Could > you confirm that I am understanding this correctly? Yes, I confirm. S

Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-24 Thread Collin Funk
Hi Bruno, On 2/24/24 5:25 PM, Bruno Haible wrote: > None of the 'sort' invocations in gnulib-tool are covered by an > entry in the gnulib-tool.py.TODO file. Therefore the most promising > approach to finding the cause of the difference is to > - go through all 'sort' invocations in gnulib-tool,

Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-24 Thread Bruno Haible
Collin Funk wrote: > So the --avoid modules are emitted in the order they are passed to > gnulib-tool, but the actual modules will be alphabetically sorted. > Therefore, I think the correct code would be: > > if len(avoids) > 0: > actioncmd += ''.join([f" \\\n# --avoid={x}" for x in avoids])

Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-24 Thread Collin Funk
On 2/24/24 4:47 PM, Collin Funk wrote: > Anyways, upon further inspection not all of the gnulib-modules are > sorted in merge-gnulib. When "unlocked-io" was added to Emacs it was > placed after "update-copyright" [1]. I assume that they are sorted > somewhere before the actioncmd step in gnulib-too

Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-24 Thread Collin Funk
Hi Bruno, Thanks for fixing the typo in the other email. I'll remember to use 'foo' instead of "foo". That is a personal habit of mine but I now realize that it goes against all of the existing code... On 2/24/24 3:42 PM, Bruno Haible wrote: > The sorted(...) instruction is not present in gnulib-

Re: gnulib-tool.py: Follow gnulib-tool changes, part 28.

2024-02-24 Thread Bruno Haible
Hi Collin, > The first one fixes an item in the > gnulib-tool.py.TODO file. Previously the "Generated by gnulib-tool" > comment at the top of the Makefile would be on one line. Thanks! Applied. Only one question on this one: > +if len(avoids) > 0: > +actioncmd += ''.join([f"