diff options
author | Devan Franchini <twitch153@gentoo.org> | 2014-12-14 02:05:23 -0500 |
---|---|---|
committer | Devan Franchini <twitch153@gentoo.org> | 2014-12-14 02:05:28 -0500 |
commit | 2e235241d8177e3b47d7b179aaa4f22c052f6cea (patch) | |
tree | 80a1e9fa0edcf7683c20ef4c1aece3db0c7a9692 | |
parent | setup.py: Adds support for sync-plugin-portage USE flag (diff) | |
download | layman-2e235241d8177e3b47d7b179aaa4f22c052f6cea.tar.gz layman-2e235241d8177e3b47d7b179aaa4f22c052f6cea.tar.bz2 layman-2e235241d8177e3b47d7b179aaa4f22c052f6cea.zip |
laymanator.py: Modifies subprocess variant of sync plugin _sync()
In order for the behavior of both the subprocess variant and the
API variant of the sync plugin _sync() functions to coincide, the
subprocess variant's function needed to be modified slightly to
add an overlay if it doesn't exist.
-rw-r--r-- | layman/laymanator/laymanator.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/layman/laymanator/laymanator.py b/layman/laymanator/laymanator.py index 5594627..94f26ee 100644 --- a/layman/laymanator/laymanator.py +++ b/layman/laymanator/laymanator.py @@ -141,6 +141,7 @@ class Layman(SyncBase): emerge_config = self.options.get('emerge_config', None) portdb = self.options.get('portdb', None) args = [] + msg = '>>> Starting layman sync for %(repo)s...'\ % ({'repo': self.repo.name}) self.logger(self.xterm_titles, msg) @@ -159,13 +160,18 @@ class Layman(SyncBase): exitcode = portage.process.spawn_bash("%(command)s" % \ ({'command': command}), **portage._native_kwargs(self.spawn_kwargs)) + if exitcode != os.EX_OK: - msg = "!!! layman sync error in %(repo)s"\ - % ({'repo': self.repo.name}) - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) - overlay = create_overlay(repo=self.repo, logger=self.logger, xterm_titles=self.xterm_titles) - return (exitcode, False) + exitcode = self.new()[0] + if exitcode != os.EX_OK: + msg = "!!! layman sync error in %(repo)s"\ + % ({'repo': self.repo.name}) + self.logger(self.xterm_titles, msg) + writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) + return (exitcode, False) + else: + return (exitcode, True) + msg = ">>> layman sync succeeded: %(repo)s"\ % ({'repo': self.repo.name}) self.logger(self.xterm_titles, msg) |