Skip to content

Commit 8218601

Browse files
authored
Merge pull request bareos#2303
python: fix traceback generation
2 parents 966ad1c + 2663792 commit 8218601

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

66
## [Unreleased]
7+
8+
### Breaking changes
9+
- Bareos 25 disables SSL on the PostgreSQL connection, as we have observed strange issues with SSL enabled.[Issue #1965]
10+
711
### Removed
812
- config: deprecate file daemon as alias for client in FD config [PR #2187]
913

@@ -87,7 +91,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
8791
- cmake: disable lto when linking gtests [PR #2286]
8892
- VMware Plugin: Fix for virtual USB devices [PR #2213]
8993
- build: add Fedora 42 [PR #2263]
94+
- python: fix traceback generation [PR #2303]
9095

96+
[Issue #1965]: https://bugs.bareos.org/view.php?id=1965
9197
[PR #1697]: https://github.com/bareos/bareos/pull/1697
9298
[PR #1893]: https://github.com/bareos/bareos/pull/1893
9399
[PR #2018]: https://github.com/bareos/bareos/pull/2018
@@ -162,4 +168,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
162168
[PR #2278]: https://github.com/bareos/bareos/pull/2278
163169
[PR #2286]: https://github.com/bareos/bareos/pull/2286
164170
[PR #2287]: https://github.com/bareos/bareos/pull/2287
171+
[PR #2303]: https://github.com/bareos/bareos/pull/2303
165172
[unreleased]: https://github.com/bareos/bareos/tree/master

core/src/plugins/include/python_plugins_common.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static std::string GetStringFromPyErrorHandler()
106106
PyErr_NormalizeException(&type, &value, &traceback);
107107

108108
PyObject* tracebackModule = PyImport_ImportModule("traceback");
109-
if (!tracebackModule) {
109+
if (tracebackModule) {
110110
PyObject *tbList = nullptr, *emptyString = nullptr, *strRetval = nullptr;
111111
if ((tbList = PyObject_CallMethod(tracebackModule, (char*)"format_exception",
112112
(char*)"OOO", type,

0 commit comments

Comments
 (0)