33231: running the cmd inside of a try except clause

sagemath · Jan 26, 2022 · 767fb8e · 767fb8e
1 parent 97d550d
commit 767fb8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/sage/features/ffmpeg.py b/src/sage/features/ffmpeg.py
@@ -94,7 +94,11 @@ def is_functional(self):
         # Running the commands and reporting any issue encountered
         from subprocess import run
         for cmd in commands:
-            result = run(cmd, cwd=base, capture_output=True, text=True)
+            try:
+                result = run(cmd, cwd=base, capture_output=True, text=True)
+            except OSError as e:
+                return FeatureTestResult(self, False, reason='Running command "{}" '
+                            'raised an OSError "{}" '.format(' '.join(cmd), e))
 
             # If an error occurred, return False
             if result.returncode:

diff --git a/src/sage/features/imagemagick.py b/src/sage/features/imagemagick.py
@@ -81,7 +81,12 @@ def is_functional(self):
         from subprocess import run
         cmd = ['convert', '-dispose', 'Background', '-delay', '20',
                 '-loop', '0', filename_png, filename_gif]
-        result = run(cmd, cwd=base, capture_output=True, text=True)
+
+        try:
+            result = run(cmd, cwd=base, capture_output=True, text=True)
+        except OSError as e:
+            return FeatureTestResult(self, False, reason='Running command "{}" '
+                        'raised an OSError "{}" '.format(' '.join(cmd), e))
 
         # If an error occurred, return False
         if result.returncode: