Merge lp:~joetalbott/uci-engine/cli_config_option into lp:uci-engine

[Joe Talbott]

cli - Add -c config option.

cli - Add -c config option.

[Evan (ev)]

Sorry for even wasting the time discussing this! I had no idea it'd be so small. :)

review: Approve

[Chris Johnston (cjohnston)]

That's just cause he didn't write any tests :-)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:452
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/570/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/570/rebuild

review: Needs Fixing (continuous-integration)

[lp:~joetalbott/uci-engine/cli_config_option]

453. By Joe Talbott on 2014-05-02

cli - make -c a global flag.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:453
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/576/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/576/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'cli/ubuntu-ci'
--- cli/ubuntu-ci	2014-03-17 17:17:25 +0000
+++ cli/ubuntu-ci	2014-05-02 17:37:38 +0000
@@ -37,6 +37,7 @@
                         default=1, type=int, choices=[1, 2, 3],
                         help='Verbosity level; 1=errors only, 2=verbose '
                         'output, 3=very verbose output')
+    parser.add_argument('-c', '--config', help='Config file')
     subparsers = parser.add_subparsers(title='actions', help='commands')
     ticket_parser = subparsers.add_parser('create_ticket',
                                           help='Create a new ticket')
@@ -121,7 +122,8 @@
             # We're not in create_ticket context, moving on.
             pass
 
-        utils.load_config(utils.DEF_CFG)
+        config_file = args.config if args.config else utils.DEF_CFG
+        utils.load_config(config_file)
         args.func(args)
         return 0
     except utils.InputError as exc: