From cad05f12566b9e1d4bead055891c689dfc14810a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 11 Sep 2017 14:50:42 +1000
Subject: [PATCH] tools: parse the argument before starting ratbagd

No point starting ratbagd for things like --help or invalid commands

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 tools/ratbagctl.devel.in | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tools/ratbagctl.devel.in b/tools/ratbagctl.devel.in
index be1e453f..a1d588bc 100755
--- a/tools/ratbagctl.devel.in
+++ b/tools/ratbagctl.devel.in
@@ -41,31 +41,31 @@ def main(argv):
     if not argv:
         argv = ["list"]
 
-    ratbagd_process = toolbox.start_ratbagd()
-    if ratbagd_process is None:
-        sys.exit("Failed to start or connect to ratbagd")
-
-    ratbagd = toolbox.open_ratbagd()
-    parser = toolbox.get_parser()
-    parser.want_keepalive = True
-
     cmd = None
-
     try:
+        parser = toolbox.get_parser()
+        parser.want_keepalive = True
         cmd = parser.parse(argv)
         if cmd.help:
             parser.print_help()
+            return
+
+        ratbagd_process = toolbox.start_ratbagd()
+        if ratbagd_process is None:
+            sys.exit("Failed to start or connect to ratbagd")
+
+        ratbagd = toolbox.open_ratbagd()
+
+        try:
+            f = cmd.func
+        except AttributeError:
+            parser.print_help()
+            return
         else:
-            try:
-                f = cmd.func
-            except AttributeError:
-                parser.print_help()
-                return
-            else:
-                f(ratbagd, cmd)
-                # give time for ratbagd to receive async requests before
-                # we try to terminate it
-                time.sleep(0.5)
+            f(ratbagd, cmd)
+            # give time for ratbagd to receive async requests before
+            # we try to terminate it
+            time.sleep(0.5)
     finally:
         try:
             if cmd.keepalive: