| 1 |
commit: abed8568369920c035f89d87e68f4e324099c61e |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 06:28:24 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Jan 29 06:28:24 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=abed8568 |
| 7 |
|
| 8 |
Update the return info to match expectations |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/sync/modules/cvs/cvs.py | 9 +++------ |
| 12 |
1 file changed, 3 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/sync/modules/cvs/cvs.py b/pym/portage/sync/modules/cvs/cvs.py |
| 15 |
index c52627c..cd376b6 100644 |
| 16 |
--- a/pym/portage/sync/modules/cvs/cvs.py |
| 17 |
+++ b/pym/portage/sync/modules/cvs/cvs.py |
| 18 |
@@ -34,7 +34,7 @@ class CVSSync(object): |
| 19 |
if not os.path.exists("/usr/bin/cvs"): |
| 20 |
print("!!! /usr/bin/cvs does not exist, so CVS support is disabled.") |
| 21 |
print("!!! Type \"emerge %s\" to enable CVS support." % portage.const.CVS_PACKAGE_ATOM) |
| 22 |
- return os.EX_UNAVAILABLE |
| 23 |
+ return os.EX_UNAVAILABLE, False |
| 24 |
|
| 25 |
if kwargs: |
| 26 |
options = kwargs.get('options', {}) |
| 27 |
@@ -54,7 +54,7 @@ class CVSSync(object): |
| 28 |
sys.stderr.write( |
| 29 |
"!!! existing '%s' directory; exiting.\n" % repo.location) |
| 30 |
exitcode = 1 |
| 31 |
- return self.post_sync(repo.location, exitcode) |
| 32 |
+ return (exitcode, False) |
| 33 |
del e |
| 34 |
if portage.process.spawn_bash( |
| 35 |
"cd %s; exec cvs -z0 -d %s co -P -d %s %s" % |
| 36 |
@@ -73,8 +73,5 @@ class CVSSync(object): |
| 37 |
if exitcode != os.EX_OK: |
| 38 |
writemsg_level("!!! cvs update error; exiting.\n", |
| 39 |
noiselevel=-1, level=logging.ERROR) |
| 40 |
- return self.post_sync(repo.location, exitcode) |
| 41 |
+ return (exitcode, False) |
| 42 |
|
| 43 |
- |
| 44 |
- def post_sync(self, location, exitcode): |
| 45 |
- return location, exitcode, False |
Archives