1 |
--- |
2 |
pym/portage/sync/modules/cvs/cvs.py | 1 - |
3 |
pym/portage/sync/modules/git/git.py | 6 ------ |
4 |
pym/portage/sync/modules/svn/svn.py | 5 ++--- |
5 |
pym/portage/sync/modules/websync/websync.py | 4 ---- |
6 |
4 files changed, 2 insertions(+), 14 deletions(-) |
7 |
|
8 |
diff --git a/pym/portage/sync/modules/cvs/cvs.py b/pym/portage/sync/modules/cvs/cvs.py |
9 |
index 9153815..9b382ab 100644 |
10 |
--- a/pym/portage/sync/modules/cvs/cvs.py |
11 |
+++ b/pym/portage/sync/modules/cvs/cvs.py |
12 |
@@ -2,7 +2,6 @@ |
13 |
# Distributed under the terms of the GNU General Public License v2 |
14 |
|
15 |
import logging |
16 |
-import errno |
17 |
|
18 |
import portage |
19 |
from portage import os |
20 |
diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py |
21 |
index cea681c..7a710ef 100644 |
22 |
--- a/pym/portage/sync/modules/git/git.py |
23 |
+++ b/pym/portage/sync/modules/git/git.py |
24 |
@@ -36,8 +36,6 @@ class GitSync(NewBase): |
25 |
'''Do the initial clone of the repository''' |
26 |
if kwargs: |
27 |
self._kwargs(kwargs) |
28 |
- emerge_config = self.options.get('emerge_config', None) |
29 |
- portdb = self.options.get('portdb', None) |
30 |
try: |
31 |
if not os.path.exists(self.repo.location): |
32 |
os.makedirs(self.repo.location) |
33 |
@@ -73,10 +71,6 @@ class GitSync(NewBase): |
34 |
that he/she wants updated. We'll let the user manage branches with |
35 |
git directly. |
36 |
''' |
37 |
- # No kwargs call here; this is internal, so it should have been |
38 |
- # called by something which set the internal variables |
39 |
- emerge_config = self.options.get('emerge_config', None) |
40 |
- portdb = self.options.get('portdb', None) |
41 |
|
42 |
git_cmd = "%s pull" % self.bin_command |
43 |
writemsg_level(git_cmd + "\n") |
44 |
diff --git a/pym/portage/sync/modules/svn/svn.py b/pym/portage/sync/modules/svn/svn.py |
45 |
index 492ada3..da38e6f 100644 |
46 |
--- a/pym/portage/sync/modules/svn/svn.py |
47 |
+++ b/pym/portage/sync/modules/svn/svn.py |
48 |
@@ -2,7 +2,6 @@ |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
|
51 |
import logging |
52 |
-import errno |
53 |
|
54 |
import portage |
55 |
from portage import os |
56 |
@@ -55,7 +54,7 @@ class SVNSync(NewBase): |
57 |
@rtype: (int, bool) |
58 |
""" |
59 |
|
60 |
- exitcode, d = self._svn_upgrade() |
61 |
+ exitcode = self._svn_upgrade() |
62 |
if exitcode != os.EX_OK: |
63 |
return (exitcode, False) |
64 |
|
65 |
@@ -87,4 +86,4 @@ class SVNSync(NewBase): |
66 |
msg = "!!! svn upgrade error; exiting." |
67 |
self.logger(self.xterm_titles, msg) |
68 |
writemsg_level(msg + "\n", noiselevel=-1, level=logging.ERROR) |
69 |
- return (exitcode, False) |
70 |
+ return exitcode |
71 |
diff --git a/pym/portage/sync/modules/websync/websync.py b/pym/portage/sync/modules/websync/websync.py |
72 |
index 3576116..b22a2a4 100644 |
73 |
--- a/pym/portage/sync/modules/websync/websync.py |
74 |
+++ b/pym/portage/sync/modules/websync/websync.py |
75 |
@@ -35,9 +35,6 @@ class WebRsync(SyncBase): |
76 |
if not self.has_bin: |
77 |
return (1, False) |
78 |
|
79 |
- emerge_config = self.options.get('emerge_config', None) |
80 |
- portdb = self.options.get('portdb', None) |
81 |
- |
82 |
exitcode = portage.process.spawn_bash("%s" % \ |
83 |
(self.bin_command), |
84 |
**portage._native_kwargs(self.spawn_kwargs)) |
85 |
@@ -46,7 +43,6 @@ class WebRsync(SyncBase): |
86 |
self.logger(self.xterm_titles, msg) |
87 |
writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) |
88 |
return (exitcode, False) |
89 |
- #return self.post_sync(portdb, self.repo.location, emerge_config) |
90 |
return (exitcode, True) |
91 |
|
92 |
|
93 |
-- |
94 |
2.2.2 |