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

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

commit:     e66be21d91f4f5264e1933a03271c4eca5f14d31
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 07:32:48 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Jun 12 21:11:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=e66be21d

{argsparser, cli}.py: adds --readd cli option

---
 layman/argsparser.py | 11 +++++++++--
 layman/cli.py        | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/layman/argsparser.py b/layman/argsparser.py
index aa1cde3..f868cca 100644
--- a/layman/argsparser.py
+++ b/layman/argsparser.py
@@ -40,9 +40,9 @@ from layman.version import VERSION
 
 
 _USAGE = """
-  layman (-a|-d|-s|-i) (OVERLAY|ALL)
+  layman (-a|-d|-r|-s|-i) (OVERLAY|ALL)
   # it also supports multiple actions
-  layman (-a|-d|-s|-i) (OVERLAY|ALL) [ [(-a|-d|-s|-i) (OVERLAY)] ...]
+  layman (-a|-d|-r|-s|-i) (OVERLAY|ALL) [ [(-a|-d|-r|-s|-i) (OVERLAY)] ...]
   layman -f [-o URL]
   layman (-l|-L|-S)"""
 
@@ -144,6 +144,13 @@ class ArgsParser(BareConfig):
                              'ing order of the overlays in the PORTDIR_OVERLAY varia'
                              'ble.')
 
+        actions.add_argument('-r',
+                             '--readd',
+                             action = 'append',
+                             help = 'Remove and re-add the given overlay from the cached'
+                             ' remote list to your locally installed overlays... Specify'
+                             ' "ALL" to re-add all local overlays.')
+
         actions.add_argument('-s',
                              '--sync',
                              action = 'append',

diff --git a/layman/cli.py b/layman/cli.py
index 159b413..f0dc181 100644
--- a/layman/cli.py
+++ b/layman/cli.py
@@ -134,7 +134,6 @@ class Main(object):
 
     def __init__(self, config):
         self.config = config
-        #print "config.keys()", config.keys()
         self.output = config['output']
         self.api = LaymanAPI(config,
                              report_errors=False,
@@ -145,6 +144,7 @@ class Main(object):
                         ('sync',       'Sync'),
                         ('info',       'Info'),
                         ('sync_all',   'Sync'),
+                        ('readd',      'Readd'),
                         ('delete',     'Delete'),
                         ('list',       'ListRemote'),
                         ('list_local', 'ListLocal'),]
@@ -251,6 +251,22 @@ class Main(object):
         return result
 
 
+    def Readd(self):
+        '''Readds the selected overlay(s).
+        '''
+        self.output.info('Reinstalling overlay(s),...', 2)
+        selection = decode_selection(self.config['readd'])
+        if ALL_KEYWORD in selection:
+            selection = self.api.get_installed()
+        self.output.debug('Reinstalling selected overlay(s)', 6)
+        result = self.api.readd_repos(selection, update_news=True)
+        if result:
+            self.output.info('Successfully reinstalled overlay(s) ' +
+                ', '.join((x.decode('UTF-8') if isinstance(x, bytes) else x) for x in selection)
+                + '.', 2)
+        self.output.notice('')
+        return result
+
 
     def Sync(self):
         ''' Syncs the selected overlays.