[diffoscope] 01/02: Ensure that we really are using ImageMagick and not, for example, the GraphicsMagick compatibility layer installed by graphicsmagick-imagemagick-compat. (Closes: #857940)

[Chris Lamb]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch experimental
in repository diffoscope.

commit d03037820c34ddd168d6ce5d000e5a5dbcbf4e7f
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Mar 16 16:59:32 2017 +0100

    Ensure that we really are using ImageMagick and not, for example, the GraphicsMagick compatibility layer installed by graphicsmagick-imagemagick-compat. (Closes: #857940)
---
 tests/comparators/test_jpeg_image.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/comparators/test_jpeg_image.py b/tests/comparators/test_jpeg_image.py
index 70012b4..6ad3418 100644
--- a/tests/comparators/test_jpeg_image.py
+++ b/tests/comparators/test_jpeg_image.py
@@ -37,6 +37,8 @@ def identify_version():
     out = subprocess.check_output(['identify', '-version'])
     # First line is expected to look like
     # "Version: ImageMagick 6.9.6-6 Q16 x86_64 20161125 ..."
+    if not out.startswith(b"Version: ImageMagick "):
+        return '0.0.0'
     return out.decode('utf-8').splitlines()[0].split()[2].strip()
 
 def test_identification(image1):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git