>From 68bcf297595c6517e5da623addae261cd34a8e98 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 9 Sep 2017 01:04:08 +0200 Subject: [PATCH 09/16] gnulib-tool.py: follow gnulib-tool changes, part 5 Follow gnulib-tool change from 2013-05-04 "Assume gnulib is checked out from Git, not CVS" --- ChangeLog | 2 +- pygnulib/GLInfo.py | 2 +- pygnulib/GLModuleSystem.py | 4 +--- pygnulib/GLTestDir.py | 6 +----- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68d3205..959483d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13629,7 +13629,7 @@ o Test only that noncanonical values do not cause crashes, not that * modules/renameat: Likewise. Also delete fstat. URL: http://bugs.gentoo.org/468790 -2012-05-04 Stefano Lattarini +2013-05-04 Stefano Lattarini Assume gnulib is checked out from Git, not CVS diff --git a/pygnulib/GLInfo.py b/pygnulib/GLInfo.py index baec6af..f992ba6 100644 --- a/pygnulib/GLInfo.py +++ b/pygnulib/GLInfo.py @@ -291,7 +291,7 @@ Report bugs to .''' 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']] diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index 2a2c8cd..6dab6dd 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -84,7 +84,7 @@ class GLModuleSystem(object): 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 @@ class GLModuleSystem(object): [ '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', diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 2937b5d..8e49a91 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -907,11 +907,7 @@ class GLMegaTestDir(object): 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() -- 2.7.4