[Piglit] [PATCH v3 1/1] framework: change one missed core.checkDir call to core.check_dir

Petri Latvala petri.latvala at intel.com
Fri Mar 23 10:11:10 UTC 2018


Commit 5e699e402a8b ("framework: rename core.checkDir to
core.check_dir") missed one call to checkDir in summary/feature. Also
convert the exception raised to PiglitFatalError.

v2: Added exception changes
v3: Fixed indentation

Signed-off-by: Petri Latvala <petri.latvala at intel.com>
Cc: Dylan Baker <dylan at pnwbakers.com>
Cc: Jari Tahvanainen <jari.tahvanainen at intel.com>
---

The indent was with spaces, but just incorrectly indented.

framework/programs/summary.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/framework/programs/summary.py b/framework/programs/summary.py
index c6f616dc8..ccfb24299 100644
--- a/framework/programs/summary.py
+++ b/framework/programs/summary.py
@@ -307,6 +307,12 @@ def feature(input_):
         shutil.rmtree(args.summaryDir)
 
     # If the requested directory doesn't exist, create it or throw an error
-    core.checkDir(args.summaryDir, not args.overwrite)
+    try:
+        core.check_dir(args.summaryDir, not args.overwrite)
+    except exceptions.PiglitException:
+        raise exceptions.PiglitFatalError(
+            '{} already exists.\n'
+            'use -o/--overwrite if you want to overwrite it.'.format(
+                args.summaryDir))
 
     summary.feat(args.resultsFiles, args.summaryDir, args.featureFile)
-- 
2.14.1



More information about the Piglit mailing list