Inject OverlaySource class into hierarchy

9 files changed, 36 insertions, 8 deletions

diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
index 6d7aa8c..3f5a0c2 100644
--- a/layman/overlays/bzr.py
+++ b/layman/overlays/bzr.py
@@ -28,6 +28,7 @@ __version__ = "$Id: bzr.py 236 2006-09-05 20:39:37Z wrobel $"
 
 from   layman.utils             import path
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -35,7 +36,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class BzrOverlay(Overlay):
+class BzrOverlay(OverlaySource):
     ''' Handles bzr overlays.'''
 
     type = 'Bzr'
diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
index 1e28cfc..7e26461 100644
--- a/layman/overlays/cvs.py
+++ b/layman/overlays/cvs.py
@@ -28,6 +28,7 @@ import xml.etree.ElementTree as ET # Python 2.5
 
 from   layman.utils             import path, ensure_unicode
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -35,7 +36,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class CvsOverlay(Overlay):
+class CvsOverlay(OverlaySource):
     ''' Handles cvs overlays.'''
 
     type = 'cvs'
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
index 049c0e2..7b6a462 100644
--- a/layman/overlays/darcs.py
+++ b/layman/overlays/darcs.py
@@ -27,6 +27,7 @@ __version__ = "$Id: darcs.py 236 2006-09-05 20:39:37Z wrobel $"
 
 from   layman.utils             import path
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -34,7 +35,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class DarcsOverlay(Overlay):
+class DarcsOverlay(OverlaySource):
     ''' Handles darcs overlays.'''
 
     type = 'Darcs'
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
index 7a9a3d7..b3c3a2b 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
@@ -26,6 +26,7 @@ __version__ = "$Id: git.py 146 2006-05-27 09:52:36Z wrobel $"
 
 from   layman.utils             import path
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -33,7 +34,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class GitOverlay(Overlay):
+class GitOverlay(OverlaySource):
     ''' Handles git overlays.'''
 
     type = 'Git'
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
index 3ee068c..8da1cf2 100644
--- a/layman/overlays/mercurial.py
+++ b/layman/overlays/mercurial.py
@@ -27,6 +27,7 @@ __version__ = "$Id: mercurial.py 236 2006-09-05 20:39:37Z wrobel $"
 
 from   layman.utils             import path
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -34,7 +35,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class MercurialOverlay(Overlay):
+class MercurialOverlay(OverlaySource):
     ''' Handles mercurial overlays.'''
 
     type = 'Mercurial'
diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py
index 9856ba1..857560e 100644
--- a/layman/overlays/rsync.py
+++ b/layman/overlays/rsync.py
@@ -26,6 +26,7 @@ __version__ = "$Id: rsync.py 236 2006-09-05 20:39:37Z wrobel $"
 
 from   layman.utils             import path
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -33,7 +34,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class RsyncOverlay(Overlay):
+class RsyncOverlay(OverlaySource):
     ''' Handles rsync overlays.'''
 
     type = 'Rsync'
diff --git a/layman/overlays/source.py b/layman/overlays/source.py
new file mode 100644
index 0000000..8ed9d31
--- /dev/null
+++ b/layman/overlays/source.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#################################################################################
+# LAYMAN OVERLAY SOURCE BASE CLASS
+#################################################################################
+# File:       source.py
+#
+#             Base class for the different overlay types.
+#
+# Copyright:
+#             (c) 2010        Sebastian Pipping
+#             Distributed under the terms of the GNU General Public License v2
+#
+# Author(s):
+#             Sebastian Pipping <sebastian@pipping.org>
+
+from layman.overlays.overlay import Overlay
+
+class OverlaySource(Overlay):
+    def __init__(self, xml, config, ignore = 0, quiet = False):
+        super(OverlaySource, self).__init__(xml, config, ignore, quiet)
diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
index da26f00..f031006 100644
--- a/layman/overlays/svn.py
+++ b/layman/overlays/svn.py
@@ -26,6 +26,7 @@ __version__ = "$Id: svn.py 236 2006-09-05 20:39:37Z wrobel $"
 
 from   layman.utils             import path
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -33,7 +34,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class SvnOverlay(Overlay):
+class SvnOverlay(OverlaySource):
     ''' Handles subversion overlays.'''
 
     type = 'Subversion'
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py
index a5474a9..7853cb3 100644
--- a/layman/overlays/tar.py
+++ b/layman/overlays/tar.py
@@ -29,6 +29,7 @@ import xml.etree.ElementTree as ET # Python 2.5
 
 from   layman.utils             import path, ensure_unicode
 from   layman.overlays.overlay  import Overlay
+from   layman.overlays.source   import OverlaySource
 
 #===============================================================================
 #
@@ -36,7 +37,7 @@ from   layman.overlays.overlay  import Overlay
 #
 #-------------------------------------------------------------------------------
 
-class TarOverlay(Overlay):
+class TarOverlay(OverlaySource):
     ''' Handles tar overlays.
 
     A dummy tar handler that overwrites the __init__ method