Fix @author in k8s plugin and ignore ouput of function check_regress_string_in_log()

diff --git a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py
index 71f1d0449d9131a957f87d91bb434dbdeeb3c07f..296388b0c3ceaab6b65c701f6e6a91699b3904f5 100644 (file)
--- a/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py
+++ b/bacula/src/plugins/fd/kubernetes-backend/baculak8s/jobs/job_pod_bacula.py
@@ -58,7 +58,7 @@ CANNOT_REMOVE_PVC_CLONE_ERR = "Cannot remove PVC snapshot. Err={}"
 CANNOT_REMOVE_VSNAPSHOT_ERR = "Unable to remove volume snapshot {vsnapshot}! Please you must remove it manually."
 CANNOT_START_CONNECTIONSERVER = "Cannot start ConnectionServer. Err={}"
 
-VSNAPSHOT_BACKUP_COMPATIBLE_INFO = "The pvc `{}` is compatible with volume snapshot backup. Doing backup with this tecnology."
+VSNAPSHOT_BACKUP_COMPATIBLE_INFO = "The pvc `{}` is compatible with volume snapshot backup. Doing backup with this technology."
 
 class JobPodBacula(Job, metaclass=ABCMeta):
     """

diff --git a/bacula/src/plugins/fd/kubernetes-backend/setup.py b/bacula/src/plugins/fd/kubernetes-backend/setup.py
index 0552413eeded41c8da2f76f712d0a3f433350c6a..30ec9dbbb58e402fadf9d0692ac15c77465901c5 100644 (file)
--- a/bacula/src/plugins/fd/kubernetes-backend/setup.py
+++ b/bacula/src/plugins/fd/kubernetes-backend/setup.py
@@ -25,8 +25,8 @@ if sys.version_info < (3, 0):
 setup(
     name='baculak8s',
     version='2.1.0',
-    author='Francisco Manuel Garcia Botella',
-    author_email='francisco.garcia@baculasystems.com',
+    author='Radoslaw Korzeniewski, Francisco Manuel Garcia Botella',
+    author_email='radekk@korzeniewski.net, francisco.garcia@baculasystems.com',
     packages=find_packages(exclude=('tests', 'tests.*')),
     # packages=packages,
     license="Bacula® - The Network Backup Solution",

diff --git a/bacula/src/plugins/fd/kubernetes-fd.c b/bacula/src/plugins/fd/kubernetes-fd.c
index 3955a3b1a7b50c549bd321d6c99af3cc5f56cdfc..1a55dbfbd3e25d9037bc6331066ca97b6b3c8b83 100644 (file)
--- a/bacula/src/plugins/fd/kubernetes-fd.c
+++ b/bacula/src/plugins/fd/kubernetes-fd.c
@@ -18,7 +18,8 @@
 */
 /**
  * @file kubernetes-fd.c
- * @author Francisco Manuel Garcia Botella (francisco.garcia@baculasystems.com)
+ * @author Radosław Korzeniewski (radoslaw@korzeniewski.net)
+ * Modified by: Francisco Manuel Garcia Botella (francisco.garcia@baculasystems.com)
  * @brief This is a Bacula Kubernetes Plugin with metaplugin interface.
  * @version 2.1.0
  * @date 2023-07-31

diff --git a/regress/scripts/regress-utils.sh b/regress/scripts/regress-utils.sh
index 674e39a7d26eb0d8569d8bb731f9cc7fd3147556..980f43eda3f990013a5dc91daba1a43967d5865c 100755 (executable)
--- a/regress/scripts/regress-utils.sh
+++ b/regress/scripts/regress-utils.sh
@@ -325,7 +325,7 @@ check_regress_string_in_log()
    to_search=$2
    n_test=$3
    log_file=${tmp}/${type_log}log${n_test}.out
-   grep "${to_search}" ${log_file}
+   grep "${to_search}" ${log_file} > /dev/null
    F=$?
    if [ $F -ne 0 ]
    then