Skip to content

Commit

Permalink
Issue 6544 - logconv.py: python3-magic conflicts with python3-file-magic
Browse files Browse the repository at this point in the history
Bug Description:
python3-magic and python3-file-magic can't be installed simultaneously,
python3-magic is not packaged for EL10.

Fix Description:
Use python3-file-magic instead.

Issue identified and fix suggested by Adam Williamson.

Fixes: #6544

Reviewed by: @mreynolds389 (Thanks!)
  • Loading branch information
vashirov committed Jan 25, 2025
1 parent 75c9dcd commit 1417198
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions ldap/admin/src/logconv.py
Original file line number Diff line number Diff line change
Expand Up @@ -1798,8 +1798,7 @@ def _is_file_compressed(self, filepath: str):
return None

try:
mime = magic.Magic(mime=True)
filetype = mime.from_file(filepath)
filetype = magic.detect_from_filename(filepath).mime_type

# List of supported compression types
compressed_mime_types = [
Expand Down
2 changes: 1 addition & 1 deletion rpm/389-ds-base.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Requires: json-c
# Log compression
Requires: zlib-devel
# logconv.py, MIME type
Requires: python-magic
Requires: python3-file-magic
# Picks up our systemd deps.
%{?systemd_requires}

Expand Down

0 comments on commit 1417198

Please sign in to comment.