Skip to content

Commit d7ced2e

Browse files
bug: intelmqsetup: fix #2197
The version of the intelmq_api is available under a different path
1 parent 6b23db6 commit d7ced2e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CHANGELOG
105105

106106
### Tools
107107
- `intelmqctl`: fix process manager initialization if run non-interactively, as intelmqdump does it (PR#2189 by Sebastian Wagner, fixes 2188).
108-
- `intelmqsetup`: Revised installation of manager by building the static files at setup, not build time, making it behave more meaningful. Requires intelmq-manager >= 3.1.0 (PR#2114 by Sebastian Wagner).
108+
- `intelmqsetup`: Revised installation of manager by building the static files at setup, not build time, making it behave more meaningful. Requires intelmq-manager >= 3.1.0 (PR#2198 by Sebastian Wagner, fixes #2197).
109109

110110
### Contrib
111111
- logrotate: Move compress and ownership rules to the IntelMQ-blocks to prevent that they apply to other files (PR#2111 by Sebastian Wagner, fixes #2110).

intelmq/bin/intelmqsetup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
try:
3535
import intelmq_api
36+
import intelmq_api.version
3637
except ImportError:
3738
intelmq_api = None
3839

@@ -320,7 +321,7 @@ def main():
320321
intelmqsetup_core(ownership=not args.skip_ownership,
321322
state_file=args.state_file)
322323
if intelmq_api and not args.skip_api:
323-
print(f'Running setup for intelmq-api (version {intelmq_api.version}).')
324+
print(f'Running setup for intelmq-api (version {intelmq_api.version.__version__}).')
324325
intelmqsetup_api(ownership=not args.skip_ownership,
325326
webserver_user=args.webserver_user)
326327
if not args.skip_webserver:

0 commit comments

Comments
 (0)