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

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

commit:     5c08a86e2c65c99a98bcfddf6f1f0d2b0c199a8c
Author:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Sat Aug  7 15:33:52 2010 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Feb 11 10:49:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=5c08a86e

Apply tulcod's g-common support changes.

---
 layman/config.py            |    1 +
 layman/overlays/g_common.py |   75 +++++++++++++++++++++++++++++++++++++++++++
 layman/overlays/overlay.py  |    2 +
 3 files changed, 78 insertions(+), 0 deletions(-)

diff --git a/layman/config.py b/layman/config.py
index e62f535..ceafcc4 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -74,6 +74,7 @@ class BareConfig(object):
                     'cvs_command': '/usr/bin/cvs',
                     'darcs_command': '/usr/bin/darcs',
                     'git_command': '/usr/bin/git',
+                    'g-common_command': '/usr/bin/g-common',
                     'mercurial_command': '/usr/bin/hg',
                     'rsync_command': '/usr/bin/rsync',
                     'svn_command': '/usr/bin/svn',

diff --git a/layman/overlays/g_common.py b/layman/overlays/g_common.py
new file mode 100644
index 0000000..80d0742
--- /dev/null
+++ b/layman/overlays/g_common.py
@@ -0,0 +1,75 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#################################################################################
+# LAYMAN G-COMMON OVERLAY HANDLER
+#################################################################################
+# File:       g_common.py
+#
+#             Handles g-common-style repositories
+#
+# Copyright:
+#             (c) 2010 Gentoo Foundation
+#             Distributed under the terms of the GNU General Public License v2
+#
+# Author(s):
+#             Auke Booij <auke@tulcod.com>
+#
+''' G-common repository support.'''
+
+#===============================================================================
+#
+# Dependencies
+#
+#-------------------------------------------------------------------------------
+
+import os
+from   layman.utils             import path
+from   layman.overlays.source   import OverlaySource, require_supported
+
+#===============================================================================
+#
+# Class GCommonOverlay
+#
+#-------------------------------------------------------------------------------
+
+class GCommonOverlay(OverlaySource):
+    ''' Handles g-common-style repositories.'''
+
+    type = 'g-common'
+    type_key = 'g-common'
+
+    def __init__(self, parent, xml, config, _location, ignore = 0, quiet = False):
+        super(GCommonOverlay, self).__init__(parent, xml, config, _location, ignore, quiet)
+        #split source into driver and remote uri. 
+        self.driver=self.src[:self.src.find(' ')]
+        self.remote_uri=self.src[self.src.find(' ')+1:]
+
+    def add(self, base, quiet = False):
+        '''Add overlay.'''
+
+        self.supported()
+
+        os.makedirs(os.path.join(base,self.parent.name))
+        return self.sync(base, quiet)
+
+    def sync(self, base, quiet = False):
+        '''Sync overlay.'''
+
+        self.supported()
+
+        args = [os.path.join(base,self.parent.name), 'sync', self.driver, self.remote_uri]
+        returncode=self.run_command(*args,cwd=path([base,self.parent.name]))
+        if returncode: return returncode
+        args = [os.path.join(base,self.parent.name), 'generate-tree']
+        return self.run_command(*args,cwd=path([base,self.parent.name]))
+
+    def supported(self):
+        '''Overlay type supported?'''
+
+        return require_supported(
+                                [(self.command(),
+                                'g-common',
+                                'app-portage/g-common'),
+                                ('/usr/share/g-common/drivers/'+self.driver+'.cfg',
+                                'g-common for '+self.driver,
+                                'app-portage/g-'+self.driver),])

diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index 4036458..6f39ae8 100644
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -40,6 +40,7 @@ from   layman.utils             import ensure_unicode
 from   layman.overlays.bzr       import BzrOverlay
 from   layman.overlays.darcs     import DarcsOverlay
 from   layman.overlays.git       import GitOverlay
+from   layman.overlays.g_common  import GCommonOverlay
 from   layman.overlays.mercurial import MercurialOverlay
 from   layman.overlays.cvs       import CvsOverlay
 from   layman.overlays.svn       import SvnOverlay
@@ -54,6 +55,7 @@ from   layman.overlays.tar       import TarOverlay
 
 OVERLAY_TYPES = dict((e.type_key, e) for e in (
     GitOverlay,
+    GCommonOverlay,
     CvsOverlay,
     SvnOverlay,
     RsyncOverlay,