If no tty check for missing and incorrect passwords

melissalinkert · Jul 3, 2018 · 7dd2d3b · 7dd2d3b
1 parent 86bf287
commit 7dd2d3b
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/components/tools/OmeroPy/src/omero/plugins/sessions.py b/components/tools/OmeroPy/src/omero/plugins/sessions.py
@@ -511,15 +511,13 @@ def login(self, args):
             if not pasw:
                 pasw = os.getenv("OMERO_PASSWORD")
 
-            if not pasw:
-                # Note: duplicating the `not pasw` check here
-                # for an overall nicer error message.
-                self._require_tty("cannot request password")
-
             tries = 3
             while True:
                 try:
                     if not pasw:
+                        # Handle absent and incorrect passwords in
+                        # non-interactive mode
+                        self._require_tty("cannot request password")
                         if args.sudo:
                             prompt = "Password for %s:" % args.sudo
                         else: