From: Richard Sandiford <richard.sandiford@arm.com>
Date: Thu, 15 Jan 2015 22:09:13 +0000 (+0000)
Subject: update-copyright.py (Copyright.__init__): Add a regexp for "copyright = u'".
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8fced9b97676f141d8334dda3319b6f7998c063d;p=gcc.git

update-copyright.py (Copyright.__init__): Add a regexp for "copyright = u'".

contrib/
	* update-copyright.py (Copyright.__init__): Add a regexp for
	"copyright = u'".
	(Copyright.update_copyright): Don't add a space before the year
	in that case.

From-SVN: r219692
---

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index f062ea90738..b4ac7d99000 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-15  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* update-copyright.py (Copyright.__init__): Add a regexp for
+	"copyright = u'".
+	(Copyright.update_copyright): Don't add a space before the year
+	in that case.
+
 2015-01-15  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* gcc_update (files_and_dependencies): Update rules for new
diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py
index 42d0bfbf2a3..f7b522a1355 100644
--- a/contrib/update-copyright.py
+++ b/contrib/update-copyright.py
@@ -183,6 +183,7 @@ class Copyright:
             '|[Cc]opyright\s+%s'
             '|[Cc]opyright\s+&copy;'
             '|[Cc]opyright\s+@copyright{}'
+            '|copyright = u\''
             '|@set\s+copyright[\w-]+)'
 
             # 2: the years.  Include the whitespace in the year, so that
@@ -363,7 +364,8 @@ class Copyright:
             return (False, orig_line, next_line)
 
         line = (line[:match.start (2)]
-                + ' ' + canon_form + self.separator
+                + ('' if intro.startswith ('copyright = ') else ' ')
+                + canon_form + self.separator
                 + line[match.end (2):])
 
         # Use the standard (C) form.