commit: c459ae02217af587d589fe564fead85838620994
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 08:24:58 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Jun 16 22:41:59 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c459ae02
Use the new SyncBase class in websync module
---
pym/portage/sync/modules/websync/websync.py | 112 ++--------------------------
1 file changed, 6 insertions(+), 106 deletions(-)
diff --git a/pym/portage/sync/modules/websync/websync.py
b/pym/portage/sync/modules/websync/websync.py
index 5954a31..7c31567 100644
--- a/pym/portage/sync/modules/websync/websync.py
+++ b/pym/portage/sync/modules/websync/websync.py
@@ -1,7 +1,9 @@
'''WebRsync module for portage'''
-class WebRsync(object):
+from portage.sync.syncbase import SyncBase
+
+class WebRsync(SyncBase):
'''WebRSync sync class'''
short_desc = "Perform sync operations on webrsync based repositories"
@@ -11,60 +13,8 @@ class WebRsync(object):
name = staticmethod(name)
- def can_progressbar(self, func):
- return False
-
-
def __init__(self):
- self.options = None
- self.settings = None
- self.logger = None
- self.repo = None
- self.xterm_titles = None
-
- self.has_git = True
- if portage.process.find_binary("emerge-webrsync") is None:
- msg = ["Command not found: git",
- "Type \"emerge %s\" to enable git support." %
portage.const.GIT_PACKAGE_ATOM]
- for l in msg:
- writemsg_level("!!! %s\n" % l,
- level=logging.ERROR, noiselevel=-1)
- self.has_git = False
-
-
- def _kwargs(self, kwargs):
- '''Sets internal variables from kwargs'''
- self.options = kwargs.get('options', {})
- self.settings = self.options.get('settings', None)
- self.logger = self.options.get('logger', None)
- self.repo = self.options.get('repo', None)
- self.xterm_titles = self.options.get('xterm_titles', False)
-
-
- def exists(self, **kwargs):
- '''Tests whether the repo actually exists'''
- if kwargs:
- self._kwargs(kwargs)
- elif not self.repo:
- return False
- spawn_kwargs = self.options.get('spawn_kwargs', None)
-
- if not os.path.exists(self.repo.location):
- return False
- return True
-
-
- def sync(self, **kwargs):
- '''Sync the repository'''
- if kwargs:
- self._kwargs(kwargs)
-
- if not self.has_git:
- return (1, False)
-
- if not self.exists():
- return self.new()
- return self._sync()
+ SyncBase.__init__(self, 'emerge-webrsync',
'>=sys-apps/portage-2.3')
def new(self, **kwargs):
@@ -85,7 +35,7 @@ class WebRsync(object):
pass
-class PyWebRsync(object):
+class PyWebRsync(SyncBase):
'''WebRSync sync class'''
short_desc = "Perform sync operations on webrsync based repositories"
@@ -95,58 +45,8 @@ class PyWebRsync(object):
name = staticmethod(name)
- def can_progressbar(self, func):
- return False
-
-
def __init__(self):
- self.options = None
- self.settings = None
- self.logger = None
- self.repo = None
- self.xterm_titles = None
-
- #if portage.process.find_binary("gpg") is None:
- #msg = ["Command not found: gpg",
- #"Type \"emerge %s\" to enable blah support." %
'emerge-webrsync']
- #for l in msg:
- #writemsg_level("!!! %s\n" % l,
- # level=logging.ERROR, noiselevel=-1)
-
-
- def _kwargs(self, kwargs):
- '''Sets internal variables from kwargs'''
- self.options = kwargs.get('options', {})
- self.settings = self.options.get('settings', None)
- self.logger = self.options.get('logger', None)
- self.repo = self.options.get('repo', None)
- self.xterm_titles = self.options.get('xterm_titles', False)
-
-
- def exists(self, **kwargs):
- '''Tests whether the repo actually exists'''
- if kwargs:
- self._kwargs(kwargs)
- elif not self.repo:
- return False
- spawn_kwargs = self.options.get('spawn_kwargs', None)
-
- if not os.path.exists(self.repo.location):
- return False
- return True
-
-
- def sync(self, **kwargs):
- '''Sync/Clone the repository'''
- if kwargs:
- self._kwargs(kwargs)
-
- if not self.has_git:
- return (1, False)
-
- if not self.exists():
- return self.new()
- return self._sync()
+ SyncBase.__init__(self, None, '>=sys-apps/portage-2.3')
def new(self, **kwargs):
