Mercurial > gnulib
changeset 38827:18d7676aaffd
gnulib-tool.py: follow gnulib-tool changes, part 5
Follow gnulib-tool change
2013-05-04 Stefano Lattarini <stefano.lattarini@gmail.com>
Assume gnulib is checked out from Git, not CVS
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 09 Sep 2017 01:04:08 +0200 |
| parents | 15ef23e0c99b |
| children | 820b89fbbf01 |
| files | ChangeLog pygnulib/GLInfo.py pygnulib/GLModuleSystem.py pygnulib/GLTestDir.py |
| diffstat | 4 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Sep 09 00:49:56 2017 +0200 +++ b/ChangeLog Sat Sep 09 01:04:08 2017 +0200 @@ -13635,7 +13635,7 @@ * modules/renameat: Likewise. Also delete fstat. URL: http://bugs.gentoo.org/468790 -2012-05-04 Stefano Lattarini <stefano.lattarini@gmail.com> +2013-05-04 Stefano Lattarini <stefano.lattarini@gmail.com> Assume gnulib is checked out from Git, not CVS
--- a/pygnulib/GLInfo.py Sat Sep 09 00:49:56 2017 +0200 +++ b/pygnulib/GLInfo.py Sat Sep 09 01:04:08 2017 +0200 @@ -291,7 +291,7 @@ return(result) def version(self): - '''Return formatted string which contains git or CVS version.''' + '''Return formatted string which contains git version.''' if isdir(DIRS['git']): version_gen = joinpath(DIRS['build-aux'], 'git-version-gen') args = [version_gen, DIRS['root']]
--- a/pygnulib/GLModuleSystem.py Sat Sep 09 00:49:56 2017 +0200 +++ b/pygnulib/GLModuleSystem.py Sat Sep 09 01:04:08 2017 +0200 @@ -84,7 +84,7 @@ raise(TypeError( 'module must be a string, not %s' % type(module).__name__)) result = bool() - badnames = ['CVS', 'ChangeLog', 'COPYING', 'README', 'TEMPLATE', + badnames = ['ChangeLog', 'COPYING', 'README', 'TEMPLATE', 'TEMPLATE-EXTENDED', 'TEMPLATE-TESTS'] if isfile(joinpath(DIRS['modules'], module)) or \ all([ # Begin all(iterable) function @@ -132,8 +132,6 @@ [ 'sed', '-e', r's,^modules/,,', - '-e', r'/^CVS\//d', - '-e', r'/\/CVS\//d', '-e', r'/^ChangeLog$/d', '-e', r'/\/ChangeLog$/d', '-e', r'/^COPYING$/d',
--- a/pygnulib/GLTestDir.py Sat Sep 09 00:49:56 2017 +0200 +++ b/pygnulib/GLTestDir.py Sat Sep 09 01:04:08 2017 +0200 @@ -907,11 +907,7 @@ repdict['Oct'] = repdict['October'] = '10' repdict['Nov'] = repdict['November'] = '11' repdict['Dec'] = repdict['December'] = '12' - if isfile(joinpath(DIRS['root'], 'CVS', 'Entries')): - vc_witness = joinpath(DIRS['root'], 'CVS', 'Entries') - else: # if not isfile(joinpath(DIRS['root'], 'CVS', 'Entries')) - vc_witness = joinpath( - DIRS['root'], '.git', 'refs', 'heads', 'master') + vc_witness = joinpath(DIRS['root'], '.git', 'refs', 'heads', 'master') mdate_sh = joinpath(DIRS['root'], 'build-aux', 'mdate-sh') args = ['sh', mdate_sh, vc_witness] cvsdate = sp.check_output(args).decode("UTF-8").strip()