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