Merge branch 'beta' into issues/716

quipucords · Feb 14, 2018 · d02a3c0 · d02a3c0
2 parents 038f995 + 0bfed57
commit d02a3c0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/qpc/cli.py b/qpc/cli.py
@@ -117,11 +117,12 @@ def main(self):
                 log.error(_(messages.SERVER_CONFIG_REQUIRED))
                 log.error('$ qpc server config --host HOST --port PORT')
                 sys.exit(1)
-            # ...and sure we are logged in
-            if not read_client_token():
-                log.error(_(messages.SERVER_LOGIN_REQUIRED))
-                log.error('$ qpc server login')
-                sys.exit(1)
+
+        if (self.args.subcommand != server.SUBCOMMAND and
+                not read_client_token()):
+            log.error(_(messages.SERVER_LOGIN_REQUIRED))
+            log.error('$ qpc server login')
+            sys.exit(1)
 
         if self.args.subcommand in self.subcommands:
             subcommand = self.subcommands[self.args.subcommand]