Patchwork [3/5] gdb/copyright.py: Do not forget to remind about MULTIPLE_COPYRIGHT_HEADERS

login
register
mail settings
Submitter Joel Brobecker
Date Jan. 1, 2018, 4:47 a.m.
Message ID <20180101044801.7201-4-brobecker@adacore.com>
Download mbox | patch
Permalink /patch/25172/
State New
Headers show

Comments

Joel Brobecker - Jan. 1, 2018, 4:47 a.m.
There is a small logical error in the part of the script that
dumps the list of files in BY_HAND + MULTIPLE_COPYRIGHT_HEADERS
but only checkis the contents of BY_HAND. The issue becomes
apparent as soon as BY_HAND is empty. Prevent this from happening
by treating the two lists separately, as this allows us to provide
a more informative message in the case of MULTIPLE_COPYRIGHT_HEADERS.

gdb/ChangeLog:

        * copyright.py (main): Dump the contents of
        MULTIPLE_COPYRIGHT_HEADERS (separately) from BY_HAND,
        even if BY_HAND is empty.
---
 gdb/ChangeLog    |  6 ++++++
 gdb/copyright.py | 11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 929c513a78..27f7c7ffee 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@ 
 2018-01-01  Joel Brobecker  <brobecker@adacore.com>
 
+	* copyright.py (main): Dump the contents of
+	MULTIPLE_COPYRIGHT_HEADERS (separately) from BY_HAND,
+	even if BY_HAND is empty.
+
+2018-01-01  Joel Brobecker  <brobecker@adacore.com>
+
 	* top.c (print_gdb_version): Update Copyright year in version
 	message.
 
diff --git a/gdb/copyright.py b/gdb/copyright.py
index dca2d56f98..bb21b21601 100644
--- a/gdb/copyright.py
+++ b/gdb/copyright.py
@@ -150,11 +150,20 @@  def main ():
     update_files (update_list)
 
     # Remind the user that some files need to be updated by HAND...
+
+    if MULTIPLE_COPYRIGHT_HEADERS:
+        print
+        print("\033[31m"
+              "REMINDER: Multiple copyright headers must be updated by hand:"
+              "\033[0m")
+        for filename in MULTIPLE_COPYRIGHT_HEADERS:
+            print "  ", filename
+
     if BY_HAND:
         print
         print "\033[31mREMINDER: The following files must be updated by hand." \
               "\033[0m"
-        for filename in BY_HAND + MULTIPLE_COPYRIGHT_HEADERS:
+        for filename in BY_HAND:
             print "  ", filename
 
 ############################################################################