[gentoo-commits] proj/layman:master commit in: layman/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     2ea5d6470df7eebe35b17b898eabb58df2fa8b5c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 01:40:32 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Jul 29 01:44:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=2ea5d647

Add cli options to both layman-updater and layman to print the setup help messages.

---
 layman/argsparser.py |  8 ++++++++
 layman/cli.py        |  7 +++++++
 layman/updater.py    | 15 ++++++++++-----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/layman/argsparser.py b/layman/argsparser.py
index 3afc3ea..3e3d6f6 100644
--- a/layman/argsparser.py
+++ b/layman/argsparser.py
@@ -82,6 +82,12 @@ class ArgsParser(BareConfig):
             usage   = _USAGE,
             version = VERSION)
 
+        self.parser.add_option('-H',
+                        '--setup_help',
+                        action = 'store_true',
+                        help = 'Print the NEW INSTALL help messages.')
+
+
         #-----------------------------------------------------------------
         # Main Options
 
@@ -283,6 +289,8 @@ class ArgsParser(BareConfig):
             self.output.debug('ARGSPARSER: Got overlay_defs location at ' + \
                 self.defaults['overlay_defs'], 8)
 
+        self._options['setup_help'] = self.options.__dict__['setup_help']
+
         # Now parse the config file
         self.output.debug('ARGSPARSER: Reading config file at ' + \
             self.defaults['config'], 8)

diff --git a/layman/cli.py b/layman/cli.py
index 25c6f9a..a5d2799 100644
--- a/layman/cli.py
+++ b/layman/cli.py
@@ -149,6 +149,13 @@ class Main(object):
             " %s" % str(self.config.keys()), 6)
         # blank newline  -- no " *"
         self.output.notice('')
+
+        # check for and handle setup-help option
+        if self.config.get_option('setup_help'):
+            from layman.updater import Main as Updater
+            updater = Updater(config=self.config, output=self.output)
+            updater.print_instructions()
+
         # Make fetching the overlay list a default action
         if not 'nofetch' in self.config.keys():
             # Actions that implicitely call the fetch operation before

diff --git a/layman/updater.py b/layman/updater.py
index b9b72bc..f7d91e6 100644
--- a/layman/updater.py
+++ b/layman/updater.py
@@ -36,20 +36,23 @@ def rename_db(config, newname, output):
 
 class Main(object):
 
-    def __init__(self, root=None):
+    def __init__(self, root=None, config=None, output=None):
         self.parser = None
-        self.output = None
-        self.config = None
+        self.output = output
+        self.config = config
         self.args = None
         self.root = root
 
     def args_parser(self):
         self.parser = argparse.ArgumentParser(prog='layman-updater',
             description="Layman's update script")
+        self.parser.add_argument("-H", '--setup_help', action='store_true',
+            help = 'Print the NEW INSTALL help messages.')
         self.parser.add_argument("-c", "--config",
             help='the path to config file')
         self.parser.add_argument('--version', action='version',
             version='%(prog)s ' + VERSION)
+
         self.args = self.parser.parse_args()
 
     def __call__(self):
@@ -64,7 +67,7 @@ class Main(object):
         # fix the config path
         defaults = self.config.get_defaults()
         defaults['config'] = defaults['config'] \
-                % {'configdir': defaults['configdir']}
+            % {'configdir': defaults['configdir']}
         self.config.update_defaults({'config': defaults['config']})
 
         self.config.read_config(defaults)
@@ -73,7 +76,9 @@ class Main(object):
 
         self.output = layman_inst.output
 
-        if not self.check_is_new():
+        if self.args.setup_help:
+            self.print_instructions()
+        elif not self.check_is_new():
             self.rename_check()