diff mbox series

Add missing backslash to update-gnulib.sh

Message ID 20230531123332.3448786-1-tromey@adacore.com
State New
Headers
Series Add missing backslash to update-gnulib.sh |

Commit Message

Tom Tromey May 31, 2023, 12:33 p.m. UTC 
  A user on irc noticed a missing backslash on one line in
update-gnulib.sh.  This patch adds it.

Re-running update-gnulib.sh causes a few copyright notices to change.
Presumably these are from upstream gnulib and shouldn't be touched by
our yearly update.  I've updated the script to account for this, but I
did not want to try testing it...
---
 gdb/copyright.py                | 2 ++
 gnulib/Makefile.in              | 2 +-
 gnulib/doc/gendocs_template     | 2 +-
 gnulib/doc/gendocs_template_min | 2 +-
 gnulib/update-gnulib.sh         | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

Comments

Joel Brobecker June 21, 2023, 1:41 p.m. UTC | #1 
> A user on irc noticed a missing backslash on one line in
> update-gnulib.sh.  This patch adds it.
> 
> Re-running update-gnulib.sh causes a few copyright notices to change.
> Presumably these are from upstream gnulib and shouldn't be touched by
> our yearly update.  I've updated the script to account for this, but I
> did not want to try testing it...

Thanks for doing this, Tom. Looks good to me!

> ---
>  gdb/copyright.py                | 2 ++
>  gnulib/Makefile.in              | 2 +-
>  gnulib/doc/gendocs_template     | 2 +-
>  gnulib/doc/gendocs_template_min | 2 +-
>  gnulib/update-gnulib.sh         | 2 +-
>  5 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/gdb/copyright.py b/gdb/copyright.py
> index 5456aca2aa0..2fbcaa9d37d 100755
> --- a/gdb/copyright.py
> +++ b/gdb/copyright.py
> @@ -218,6 +218,8 @@ EXCLUDE_LIST = (
>      "gdb/nat/glibc_thread_db.h",
>      "gdb/CONTRIBUTE",
>      "gdbsupport/Makefile.in",
> +    "gnulib/doc/gendocs_template",
> +    "gnulib/doc/gendocs_template_min",
>      "gnulib/import",
>      "gnulib/config.in",
>      "gnulib/Makefile.in",
> diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in
> index 6a2091627d2..8d5bf7f1672 100644
> --- a/gnulib/Makefile.in
> +++ b/gnulib/Makefile.in
> @@ -14,7 +14,7 @@
>  
>  @SET_MAKE@
>  
> -# Copyright (C) 2019-2022 Free Software Foundation, Inc.
> +# Copyright (C) 2019-2023 Free Software Foundation, Inc.
>  
>  # This file is part of GDB.
>  
> diff --git a/gnulib/doc/gendocs_template b/gnulib/doc/gendocs_template
> index a101977dfc4..0415d947be6 100644
> --- a/gnulib/doc/gendocs_template
> +++ b/gnulib/doc/gendocs_template
> @@ -2,7 +2,7 @@
>  <!-- Parent-Version: 1.78 -->
>  
>  <!--
> -Copyright (C) 2006-2023 Free Software Foundation, Inc.
> +Copyright (C) 2006-2022 Free Software Foundation, Inc.
>  
>  Copying and distribution of this file, with or without modification,
>  are permitted in any medium without royalty provided the copyright
> diff --git a/gnulib/doc/gendocs_template_min b/gnulib/doc/gendocs_template_min
> index 273e741a1d6..369f494476a 100644
> --- a/gnulib/doc/gendocs_template_min
> +++ b/gnulib/doc/gendocs_template_min
> @@ -4,7 +4,7 @@
>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
>  
>  <!--
> -Copyright (C) 2007-2023 Free Software Foundation, Inc.
> +Copyright (C) 2007-2022 Free Software Foundation, Inc.
>  
>  Copying and distribution of this file, with or without modification,
>  are permitted in any medium without royalty provided the copyright
> diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
> index 3aa9f752912..9b0a95500e8 100755
> --- a/gnulib/update-gnulib.sh
> +++ b/gnulib/update-gnulib.sh
> @@ -49,7 +49,7 @@ IMPORTED_GNULIB_MODULES="\
>      gettimeofday \
>      gitlog-to-changelog \
>      glob \
> -    inet_ntop
> +    inet_ntop \
>      inttypes \
>      lstat \
>      limits-h \
> -- 
> 2.40.0
>
diff mbox series

Patch

diff --git a/gdb/copyright.py b/gdb/copyright.py
index 5456aca2aa0..2fbcaa9d37d 100755
--- a/gdb/copyright.py
+++ b/gdb/copyright.py
@@ -218,6 +218,8 @@  EXCLUDE_LIST = (
     "gdb/nat/glibc_thread_db.h",
     "gdb/CONTRIBUTE",
     "gdbsupport/Makefile.in",
+    "gnulib/doc/gendocs_template",
+    "gnulib/doc/gendocs_template_min",
     "gnulib/import",
     "gnulib/config.in",
     "gnulib/Makefile.in",
diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in
index 6a2091627d2..8d5bf7f1672 100644
--- a/gnulib/Makefile.in
+++ b/gnulib/Makefile.in
@@ -14,7 +14,7 @@ 
 
 @SET_MAKE@
 
-# Copyright (C) 2019-2022 Free Software Foundation, Inc.
+# Copyright (C) 2019-2023 Free Software Foundation, Inc.
 
 # This file is part of GDB.
 
diff --git a/gnulib/doc/gendocs_template b/gnulib/doc/gendocs_template
index a101977dfc4..0415d947be6 100644
--- a/gnulib/doc/gendocs_template
+++ b/gnulib/doc/gendocs_template
@@ -2,7 +2,7 @@ 
 <!-- Parent-Version: 1.78 -->
 
 <!--
-Copyright (C) 2006-2023 Free Software Foundation, Inc.
+Copyright (C) 2006-2022 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/gnulib/doc/gendocs_template_min b/gnulib/doc/gendocs_template_min
index 273e741a1d6..369f494476a 100644
--- a/gnulib/doc/gendocs_template_min
+++ b/gnulib/doc/gendocs_template_min
@@ -4,7 +4,7 @@ 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <!--
-Copyright (C) 2007-2023 Free Software Foundation, Inc.
+Copyright (C) 2007-2022 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
index 3aa9f752912..9b0a95500e8 100755
--- a/gnulib/update-gnulib.sh
+++ b/gnulib/update-gnulib.sh
@@ -49,7 +49,7 @@  IMPORTED_GNULIB_MODULES="\
     gettimeofday \
     gitlog-to-changelog \
     glob \
-    inet_ntop
+    inet_ntop \
     inttypes \
     lstat \
     limits-h \