Merge pull request #218 from ellert/remove-extra-comma

Remove extra comma
gridcf · Nov 10, 2023 · 07008c3 · 07008c3
2 parents b4e87e2 + 6cfb519
commit 07008c3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/gsi/sysconfig/source/configure.ac b/gsi/sysconfig/source/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.60])
 
-AC_INIT([globus_gsi_sysconfig], [9.5],[https://github.com/gridcf/gct/issues])
+AC_INIT([globus_gsi_sysconfig], [9.6],[https://github.com/gridcf/gct/issues])
 AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}])
 AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}])

diff --git a/gsi/sysconfig/source/library/globus_gsi_system_config.c b/gsi/sysconfig/source/library/globus_gsi_system_config.c
@@ -1903,7 +1903,7 @@ globus_gsi_sysconfig_get_user_cert_filename_win32(
         GLOBUS_GSI_SYSCONFIG_ERROR_RESULT(
             result,
             GLOBUS_GSI_SYSCONFIG_ERROR_GETTING_KEY_STRING,
-            (_GSSL("The user key could not be found in:\n,"
+            (_GSSL("The user key could not be found in:\n"
              "1) env. var. X509_USER_KEY\n"
              "2) $HOME/.globus/userkey.pem\n"
              "3) $HOME/.globus/usercred.p12\n\n")));
@@ -5275,7 +5275,7 @@ globus_gsi_sysconfig_get_user_cert_filename_unix(
         GLOBUS_GSI_SYSCONFIG_ERROR_RESULT(
             result,
             GLOBUS_GSI_SYSCONFIG_ERROR_GETTING_KEY_STRING,
-            (_GSSL("The user key could not be found in:\n,"
+            (_GSSL("The user key could not be found in:\n"
              "1) env. var. X509_USER_KEY\n"
              "2) $HOME/.globus/userkey.pem\n"
              "3) $HOME/.globus/usercred.p12\n\n")));

diff --git a/packaging/debian/globus-gsi-sysconfig/debian/changelog.in b/packaging/debian/globus-gsi-sysconfig/debian/changelog.in
@@ -1,3 +1,9 @@
+globus-gsi-sysconfig (9.6-1+gct.@distro@) @distro@; urgency=medium
+
+  * Remove extra comma
+
+ -- Mattias Ellert <[email protected]>  Fri, 10 Nov 2023 22:48:25 +0100
+
 globus-gsi-sysconfig (9.5-1+gct.@distro@) @distro@; urgency=medium
 
   * Fix some compiler warnings

diff --git a/packaging/fedora/globus-gsi-sysconfig.spec b/packaging/fedora/globus-gsi-sysconfig.spec
@@ -3,7 +3,7 @@
 Name:		globus-gsi-sysconfig
 %global soname 1
 %global _name %(echo %{name} | tr - _)
-Version:	9.5
+Version:	9.6
 Release:	1%{?dist}
 Summary:	Grid Community Toolkit - Globus GSI System Config Library
 
@@ -150,6 +150,9 @@ make %{?_smp_mflags} check VERBOSE=1
 %doc %{_pkgdocdir}/GLOBUS_LICENSE
 
 %changelog
+* Fri Nov 10 2023 Mattias Ellert <[email protected]> - 9.6-1
+- Remove extra comma
+
 * Thu Mar 10 2022 Mattias Ellert <[email protected]> - 9.5-1
 - Fix some compiler warnings