aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2012-06-05 13:29:07 +0000
committerJoel Brobecker <brobecker@gnat.com>2012-06-05 13:29:07 +0000
commit399501a53f685885a43ea9d506f6707e596aa6d6 (patch)
tree6e0a23b373620c395564f9c36e0edb285c916b53
parent3770a1599ecd04bc5860aa6d0c6ed1376d2e7798 (diff)
downloadgdb-399501a53f685885a43ea9d506f6707e596aa6d6.zip
gdb-399501a53f685885a43ea9d506f6707e596aa6d6.tar.gz
gdb-399501a53f685885a43ea9d506f6707e596aa6d6.tar.bz2
copyright.py: Update path to gnulib import.
The location where we store the gnulib import has changed. This patch updates accordingly the path to gnulib's update-copyright script. gdb/ChangeLog: * copyright.py (update_files, main): Fix path to update-copyright script.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/copyright.py6
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0ab658c..f530b5b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2012-06-05 Joel Brobecker <brobecker@adacore.com>
+ * copyright.py (update_files, main): Fix path to update-copyright
+ script.
+
+2012-06-05 Joel Brobecker <brobecker@adacore.com>
+
* copyright.py (MULTIPLE_COPYRIGHT_HEADERS): New constant.
(main): Add MULTIPLE_COPYRIGHT_HEADERS to the list of files
for which a reminder to update by hand is printed.
diff --git a/gdb/copyright.py b/gdb/copyright.py
index d83c93e..ff51ca4 100644
--- a/gdb/copyright.py
+++ b/gdb/copyright.py
@@ -79,7 +79,9 @@ def update_files(update_list):
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
+ update_cmd = ['bash', 'gdb/gnulib/import/extra/update-copyright']
+ update_cmd += update_list
+
p = subprocess.Popen(update_cmd, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
update_out = p.communicate()[0]
@@ -139,7 +141,7 @@ def may_have_copyright_notice(filename):
def main ():
"""The main subprogram."""
- if not os.path.isfile("gnulib/extra/update-copyright"):
+ if not os.path.isfile("gnulib/import/extra/update-copyright"):
print "Error: This script must be called from the gdb directory."
root_dir = os.path.dirname(os.getcwd())
os.chdir(root_dir)