Merge pull request #2533 from wazuh/bug/4.5.4-fix-changelog

Fix 4.5.4 changelog and include bump script in branch 4.5.4
wazuh · Oct 18, 2023 · b3b849c · b3b849c
2 parents f21b208 + 9e140e5
commit b3b849c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/bump_version.py b/bump_version.py
@@ -72,7 +72,7 @@
         filedata=file.read()
         install_type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))',
                                filedata).group(1)
-        changelog_string=(f"wazuh-{install_type} ({version}-RELEASE) stable; "
+        changelog_string=(f"{install_type} ({version}-RELEASE) stable; "
             "urgency=low\n\n  * More info: https://documentation.wazuh.com/"
             f"current/release-notes/release-{version.major}-{version.minor}-"
             f"{version.micro}.html\n\n -- "
@@ -128,9 +128,9 @@
         REGEX=r'<string>(\d+\.\d+\.\d+)-(\d+)</string>'
         filedata=re.sub(REGEX, f'<string>{version}-{args.revision}</string>',
                           filedata)
-        REGEX=r'<string>wazuh-agent-(\d+\.\d+\.\d+)-(\d+)</string>'
+        REGEX=r'<string>wazuh-agent-(\d+\.\d+\.\d+)-(\d+)'
         filedata=re.sub(REGEX,
-                    f'<string>wazuh-agent-{version}-{args.revision}</string>',
+                    f'<string>wazuh-agent-{version}-{args.revision}',
                     filedata)
 
     with open(pkgproj_file, 'w', encoding="utf-8") as file:

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -1,4 +1,4 @@
-wazuh-wazuh-agent (4.5.4-RELEASE) stable; urgency=low
+wazuh-agent (4.5.4-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -1,4 +1,4 @@
-wazuh-wazuh-manager (4.5.4-RELEASE) stable; urgency=low
+wazuh-manager (4.5.4-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -1,4 +1,4 @@
-wazuh-wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low
+wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -1,4 +1,4 @@
-wazuh-wazuh-indexer (4.5.4-RELEASE) stable; urgency=low
+wazuh-indexer (4.5.4-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html