mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
45a0856880
Replace the soft dep on sys-apps/file (magic module) with the existing fallback file suffix check Remove the sys-apps/file[python] suggestion in pkg_postinst Closes: https://bugs.gentoo.org/722560 Signed-off-by: Paul Healy <lmiphay@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16360 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
36 lines
836 B
Diff
36 lines
836 B
Diff
diff --git a/syslog-summary b/syslog-summary
|
|
index abf6381..b3edffc 100755
|
|
--- a/syslog-summary
|
|
+++ b/syslog-summary
|
|
@@ -128,24 +128,12 @@ def split_date(line):
|
|
|
|
def is_gzipped(filename):
|
|
"""Returns True if the filename is a gzipped compressed file"""
|
|
- try:
|
|
- import magic
|
|
- ms = magic.open(magic.MAGIC_NONE)
|
|
- ms.load()
|
|
- if re.search("^gzip compressed data.*", ms.file(filename)):
|
|
- return True
|
|
- else:
|
|
- return False
|
|
- except:
|
|
- from os.path import splitext
|
|
-
|
|
- if not QUIET:
|
|
- print "Using fallback detection... please install python-magic for better gzip detection."
|
|
-
|
|
- if splitext(filename)[1] == ".gz":
|
|
- return True
|
|
- else:
|
|
- return False
|
|
+ from os.path import splitext
|
|
+
|
|
+ if splitext(filename)[1] == ".gz":
|
|
+ return True
|
|
+ else:
|
|
+ return False
|
|
|
|
def summarize(filename, states):
|
|
counts = {}
|