Merge pull request #475 from NYUCCL/fix-shell-invalid-aws-cred-messaging

switch order of quiet and aws_wrapper check
NYUCCL · Mar 16, 2021 · 9f86efd · 9f86efd
2 parents 1d4d6b0 + 8240c57
commit 9f86efd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 3.0.4
 ### Fixed
 - fix shell's error during hit_create that prevented ad url from showing.
+- fix shell's messaging about invalid aws credentials
 
 ## 3.0.3
 ### Fixed

diff --git a/psiturk/psiturk_shell.py b/psiturk/psiturk_shell.py
@@ -93,8 +93,11 @@ def amt_services_wrapper(self):
                     '- `psiturk server on`',
                     '- `psiturk server off`',
                     '- `psiturk debug -p`'])
-                message = '{}{}'.format(e.message, still_can_do)
+                message = e.message
+                if not self.quiet:
+                    message = '{}{}'.format(message, still_can_do)
                 self.perror(message)
+                sys.exit()
             except PsiturkException as e:
                 self.poutput(e)
 
@@ -146,7 +149,7 @@ def __init__(self, config, server, mode='sandbox', quiet=False):
         self.quiet = quiet
         self.feedback_to_output = True
 
-        if not self.amt_services_wrapper and not self.quiet:
+        if not self.quiet and not self.amt_services_wrapper:
             sys.exit()
 
         if not self.quiet: