---
pym/portage/sync/modules/cvs/cvs.py | 1 -
pym/portage/sync/modules/git/git.py | 6 ------
pym/portage/sync/modules/svn/svn.py | 5 ++---
pym/portage/sync/modules/websync/websync.py | 4 ----
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/pym/portage/sync/modules/cvs/cvs.py
b/pym/portage/sync/modules/cvs/cvs.py
index 9153815..9b382ab 100644
--- a/pym/portage/sync/modules/cvs/cvs.py
+++ b/pym/portage/sync/modules/cvs/cvs.py
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
import logging
-import errno
import portage
from portage import os
diff --git a/pym/portage/sync/modules/git/git.py
b/pym/portage/sync/modules/git/git.py
index cea681c..7a710ef 100644
--- a/pym/portage/sync/modules/git/git.py
+++ b/pym/portage/sync/modules/git/git.py
@@ -36,8 +36,6 @@ class GitSync(NewBase):
'''Do the initial clone of the repository'''
if kwargs:
self._kwargs(kwargs)
- emerge_config = self.options.get('emerge_config', None)
- portdb = self.options.get('portdb', None)
try:
if not os.path.exists(self.repo.location):
os.makedirs(self.repo.location)
@@ -73,10 +71,6 @@ class GitSync(NewBase):
that he/she wants updated. We'll let the user manage branches
with
git directly.
'''
- # No kwargs call here; this is internal, so it should have been
- # called by something which set the internal variables
- emerge_config = self.options.get('emerge_config', None)
- portdb = self.options.get('portdb', None)
git_cmd = "%s pull" % self.bin_command
writemsg_level(git_cmd + "\n")
diff --git a/pym/portage/sync/modules/svn/svn.py
b/pym/portage/sync/modules/svn/svn.py
index 492ada3..da38e6f 100644
--- a/pym/portage/sync/modules/svn/svn.py
+++ b/pym/portage/sync/modules/svn/svn.py
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
import logging
-import errno
import portage
from portage import os
@@ -55,7 +54,7 @@ class SVNSync(NewBase):
@rtype: (int, bool)
"""
- exitcode, d = self._svn_upgrade()
+ exitcode = self._svn_upgrade()
if exitcode != os.EX_OK:
return (exitcode, False)
@@ -87,4 +86,4 @@ class SVNSync(NewBase):
msg = "!!! svn upgrade error; exiting."
self.logger(self.xterm_titles, msg)
writemsg_level(msg + "\n", noiselevel=-1,
level=logging.ERROR)
- return (exitcode, False)
+ return exitcode
diff --git a/pym/portage/sync/modules/websync/websync.py
b/pym/portage/sync/modules/websync/websync.py
index 3576116..b22a2a4 100644
--- a/pym/portage/sync/modules/websync/websync.py
+++ b/pym/portage/sync/modules/websync/websync.py
@@ -35,9 +35,6 @@ class WebRsync(SyncBase):
if not self.has_bin:
return (1, False)
- emerge_config = self.options.get('emerge_config', None)
- portdb = self.options.get('portdb', None)
-
exitcode = portage.process.spawn_bash("%s" % \
(self.bin_command),
**portage._native_kwargs(self.spawn_kwargs))
@@ -46,7 +43,6 @@ class WebRsync(SyncBase):
self.logger(self.xterm_titles, msg)
writemsg_level(msg + "\n", level=logging.ERROR,
noiselevel=-1)
return (exitcode, False)
- #return self.post_sync(portdb, self.repo.location,
emerge_config)
return (exitcode, True)
--
2.2.2
