simplified run_script() function in tools.py

Miguel Barão
1 parent bee4a6e0
Showing 1 changed file with 5 additions and 10 deletions Show diff stats
perguntations/tools.py
@@ -67,21 +67,16 @@ def run_script(script: str,
                               stderr=subprocess.STDOUT,
                               universal_newlines=True,
                               timeout=timeout,
-                              check=False,
+                              check=True,
                               )
-    except OSError:
-        logger.error('Can not execute script "%s".', script)
-        return output
     except subprocess.TimeoutExpired:
         logger.error('Timeout %ds exceeded running "%s".', timeout, script)
         return output
-    except Exception:
-        logger.error('An Exception ocurred running "%s".', script)
+    except subprocess.CalledProcessError as exc:
+        logger.error('Return code %d running "%s".', exc.returncode, script)
         return output
-
-    # --- check return code
-    if proc.returncode != 0:
-        logger.error('Return code %d running "%s".', proc.returncode, script)
+    except OSError:
+        logger.error('Can not execute script "%s".', script)
         return output
  
     # --- parse yaml
...	...	@@ -67,21 +67,16 @@ def run_script(script: str,
67	67	stderr=subprocess.STDOUT,
68	68	universal_newlines=True,
69	69	timeout=timeout,
70		- check=False,
	70	+ check=True,
71	71	)
72		- except OSError:
73		- logger.error('Can not execute script "%s".', script)
74		- return output
75	72	except subprocess.TimeoutExpired:
76	73	logger.error('Timeout %ds exceeded running "%s".', timeout, script)
77	74	return output
78		- except Exception:
79		- logger.error('An Exception ocurred running "%s".', script)
	75	+ except subprocess.CalledProcessError as exc:
	76	+ logger.error('Return code %d running "%s".', exc.returncode, script)
80	77	return output
81		-
82		- # --- check return code
83		- if proc.returncode != 0:
84		- logger.error('Return code %d running "%s".', proc.returncode, script)
	78	+ except OSError:
	79	+ logger.error('Can not execute script "%s".', script)
85	80	return output
86	81
87	82	# --- parse yaml
...	...