From 8ba85d852669213fb96aca1cc5449d3789c315e2 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 1 Mar 2012 02:41:04 +0000 Subject: Import gnulib's latest update-copyright script... ... and update our copyright.py script to set environment variable UPDATE_COPYRIGHT_USE_INTERVALS to '2' instead of '1'. This tells the script to collapse all years into one single interval. gdb/ChangeLog: * gnulib/extra/update-copyright: Update to the latest from gnulib's git repository. * copyright.py: Set UPDATE_COPYRIGHT_USE_INTERVALS environment variable to 2 instead of 1. --- gdb/copyright.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gdb/copyright.py') diff --git a/gdb/copyright.py b/gdb/copyright.py index d2df65e..180e7c4 100644 --- a/gdb/copyright.py +++ b/gdb/copyright.py @@ -84,8 +84,11 @@ def update_files(update_list): # repeat the prefixes in MULTILINE_COMMENT_PREFIXES. os.environ['MULTILINE_COMMENT_PREFIXES'] = \ '\n'.join(MULTILINE_COMMENT_PREFIXES) - # We want to use year intervals in the copyright notices. - os.environ['UPDATE_COPYRIGHT_USE_INTERVALS'] = '1' + # We want to use year intervals in the copyright notices, and + # all years should be collapsed to one single year interval, + # even if there are "holes" in the list of years found in the + # original copyright notice (OK'ed by the FSF, case [gnu.org #719834]). + os.environ['UPDATE_COPYRIGHT_USE_INTERVALS'] = '2' # Perform the update, and save the output in a string. update_cmd = ['bash', 'gdb/gnulib/extra/update-copyright'] + update_list -- cgit v1.1