lib/gnulib
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2026-10-24 00:48:56 +03:00
Code Activity

gnulib-tool.py: Simplify running some commands in a given directory.

Browse Source 
* pygnulib/GLImport.py (GLImport.execute): Use sp.call with a cwd
argument, instead of calling chdir twice.
* pygnulib/GLModuleSystem.py (GLModuleSystem.list): Likewise.
* pygnulib/main.py (mode=='find'): Likewise.
This commit is contained in:
Bruno Haible
2024-04-19 18:21:26 +02:00
parent 6adcc62840
commit 344f86830c
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2024-04-19 Bruno Haible <bruno@clisp.org>
gnulib-tool.py: Simplify running some commands in a given directory.
* pygnulib/GLImport.py (GLImport.execute): Use sp.call with a cwd
argument, instead of calling chdir twice.
* pygnulib/GLModuleSystem.py (GLModuleSystem.list): Likewise.
* pygnulib/main.py (mode=='find'): Likewise.
2024-04-19 Bruno Haible <bruno@clisp.org>
gnulib-tool.py: Update authors list.

3
gnulib-tool.py.TODO
View File

@@ -5,9 +5,6 @@ Bugs:
- error message missing when gl_DOC_BASE missing
https://lists.gnu.org/archive/html/bug-gnulib/2024-04/msg00160.html
Optimize:
- os.chdir around subprocess creation -> cwd=... argument instead.
Various other refactorings, as deemed useful:
- Use an enum for 'all', 'old', 'new', 'added', 'removed' in GLImport.py.

4
pygnulib/GLImport.py
View File

@@ -1200,11 +1200,9 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
TP_URL = 'https://translationproject.org/latest/'
if not self.config['dryrun']:
print('Fetching gnulib PO files from %s' % TP_URL)
os.chdir(joinpath(destdir, pobase))
args = ['wget', '--no-verbose', '--mirror', '--level=1', '-nd', '-A.po', '-P', '.',
'%sgnulib/' % TP_URL]
sp.call(args)
os.chdir(DIRS['cwd'])
sp.call(args, cwd=joinpath(destdir, pobase))
else: # if self.config['dryrun']
print('Fetch gnulib PO files from %s' % TP_URL)

8
pygnulib/GLModuleSystem.py
View File

@@ -133,16 +133,12 @@ class GLModuleSystem:
find_args = ['find', 'modules', '-type', 'f', '-print']
# Read modules from gnulib root directory.
os.chdir(constants.DIRS['root'])
result += sp.run(find_args, text=True, capture_output=True, check=False).stdout
os.chdir(DIRS['cwd'])
result += sp.run(find_args, cwd=constants.DIRS['root'], text=True, capture_output=True, check=False).stdout
# Read modules from local directories.
if len(localpath) > 0:
for localdir in localpath:
os.chdir(localdir)
result += sp.run(find_args, text=True, capture_output=True, check=False).stdout
os.chdir(DIRS['cwd'])
result += sp.run(find_args, cwd=localdir, text=True, capture_output=True, check=False).stdout
listing = [ line
for line in result.split('\n')

8
pygnulib/main.py
View File

@@ -872,18 +872,14 @@ def main() -> None:
filename_line_regex = '^' + filename_regex + '$'
# Read module candidates from gnulib root directory.
command = "find modules -type f -print | xargs -n 100 grep -l %s /dev/null | sed -e 's,^modules/,,'" % shlex.quote(filename_line_regex)
os.chdir(constants.DIRS['root'])
with sp.Popen(command, shell=True, stdout=sp.PIPE) as proc:
with sp.Popen(command, shell=True, cwd=constants.DIRS['root'], stdout=sp.PIPE) as proc:
result = proc.stdout.read().decode('UTF-8')
os.chdir(DIRS['cwd'])
# Read module candidates from local directories.
if localpath != None and len(localpath) > 0:
command = "find modules -type f -print | xargs -n 100 grep -l %s /dev/null | sed -e 's,^modules/,,' -e 's,\\.diff$,,'" % shlex.quote(filename_line_regex)
for localdir in localpath:
os.chdir(localdir)
with sp.Popen(command, shell=True, stdout=sp.PIPE) as proc:
with sp.Popen(command, shell=True, cwd=localdir, stdout=sp.PIPE) as proc:
result += proc.stdout.read().decode('UTF-8')
os.chdir(DIRS['cwd'])
listing = [ line
for line in result.split('\n')
if line.strip() ]