| 1 |
commit: fba46d15a846255fcbb675013e7695210fcbce20 |
| 2 |
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 17 03:28:43 2014 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 19 03:49:57 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=fba46d15 |
| 7 |
|
| 8 |
layman.py: Adds api variant of new() function |
| 9 |
|
| 10 |
Also cleans up output messages as well as some variable |
| 11 |
interpolation. |
| 12 |
|
| 13 |
--- |
| 14 |
layman/sync/layman.py | 37 +++++++++++++++++++++++++++---------- |
| 15 |
1 file changed, 27 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/layman/sync/layman.py b/layman/sync/layman.py |
| 18 |
index 426c145..a480e22 100644 |
| 19 |
--- a/layman/sync/layman.py |
| 20 |
+++ b/layman/sync/layman.py |
| 21 |
@@ -41,7 +41,7 @@ class Layman(SyncBase): |
| 22 |
args.append('-q') |
| 23 |
|
| 24 |
def new(self, **kwargs): |
| 25 |
- '''Do the initial download and install of the repository''' |
| 26 |
+ '''Use layman to install the repository''' |
| 27 |
if kwargs: |
| 28 |
self._kwargs(kwargs) |
| 29 |
emerge_config = self.options.get('emerge_config', None) |
| 30 |
@@ -62,7 +62,7 @@ class Layman(SyncBase): |
| 31 |
({'command': command}), |
| 32 |
**portage._native_kwargs(self.spawn_kwargs)) |
| 33 |
if exitcode != os.EX_OK: |
| 34 |
- msg = "!!! layman sync error in %(repo)s" % ({'repo': self.repo.name}) |
| 35 |
+ msg = "!!! layman add error in %(repo)s" % ({'repo': self.repo.name}) |
| 36 |
self.logger(self.xterm_titles, msg) |
| 37 |
writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) |
| 38 |
return (exitcode, False) |
| 39 |
@@ -77,7 +77,7 @@ class Layman(SyncBase): |
| 40 |
emerge_config = self.options.get('emerge_config', None) |
| 41 |
portdb = self.options.get('portdb', None) |
| 42 |
args = [] |
| 43 |
- msg = '>>> Starting layman sync for %s...' % self.repo.name |
| 44 |
+ msg = '>>> Starting layman sync for %(repo)s...' % ({'repo': self.repo.name}) |
| 45 |
self.logger(self.xterm_titles, msg) |
| 46 |
writemsg_level(msg + '\n') |
| 47 |
|
| 48 |
@@ -86,15 +86,16 @@ class Layman(SyncBase): |
| 49 |
args.append('-s') |
| 50 |
args.append(self.repo.name) |
| 51 |
|
| 52 |
- exitcode = portage.process.spawn_bash("%s" % \ |
| 53 |
- (' '.join(args)), |
| 54 |
+ command = ' '.join(args) |
| 55 |
+ exitcode = portage.process.spawn_bash("%(command)s" % \ |
| 56 |
+ ({'command': command}), |
| 57 |
**portage._native_kwargs(self.spawn_kwargs)) |
| 58 |
if exitcode != os.EX_OK: |
| 59 |
- msg = "!!! layman sync error in %s" % self.repo.name |
| 60 |
+ msg = "!!! layman sync error in %(repo)s" % ({'repo': self.repo.name}) |
| 61 |
self.logger(self.xterm_titles, msg) |
| 62 |
writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) |
| 63 |
return (exitcode, False) |
| 64 |
- msg = ">>> layman sync succeeded: %s" % self.repo.name |
| 65 |
+ msg = ">>> layman sync succeeded: %(repo)s" % ({'repo': self.repo.name}) |
| 66 |
self.logger(self.xterm_titles, msg) |
| 67 |
writemsg_level(msg + "\n") |
| 68 |
|
| 69 |
@@ -141,8 +142,24 @@ class PyLayman(SyncBase): |
| 70 |
|
| 71 |
def new(self, **kwargs): |
| 72 |
'''Do the initial download and install of the repository''' |
| 73 |
- pass |
| 74 |
+ layman_inst = self._get_layman_api() |
| 75 |
+ |
| 76 |
+ emerge_config = self.options.get('emerge_config', None) |
| 77 |
+ portdb = self.options.get('portdb', None) |
| 78 |
|
| 79 |
+ msg = '>>> Starting to add new layman overlay %(repo)s' % ({'repo': self.repo.name}) |
| 80 |
+ self.logger(self.xterm_titles, msg) |
| 81 |
+ writemsg_level(msg + '\n') |
| 82 |
+ |
| 83 |
+ exitcode = layman_inst.add_repos(self.repo.name) |
| 84 |
+ if exitcode != os.EX_OK: |
| 85 |
+ msg = "!!! layman add error in %(repo)s" % ({'repo': self.repo.name}) |
| 86 |
+ self.logger(self.xterm_titles, msg) |
| 87 |
+ writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) |
| 88 |
+ return (exitcode, False) |
| 89 |
+ msg = ">>> Addition of layman repo succeeded: %(repo)s" % ({'repo': self.repo.name}) |
| 90 |
+ self.logger(self.xterm_titles, msg) |
| 91 |
+ writemsg_level(msg + '\n') |
| 92 |
|
| 93 |
def _sync(self): |
| 94 |
''' Update existing repository''' |
| 95 |
@@ -160,8 +177,8 @@ class PyLayman(SyncBase): |
| 96 |
msg = "!!! layman sync error in %(repo)s" % ({'repo': self.repo.name}) |
| 97 |
self.logger(self.xterm_titles, msg) |
| 98 |
writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) |
| 99 |
- return(exitcode, False) |
| 100 |
- msg = ">>> layman sync succeeded: %s" % self.repo.name |
| 101 |
+ return (exitcode, False) |
| 102 |
+ msg = ">>> layman sync succeeded: %(repo)s" % ({'repo': self.repo.name}) |
| 103 |
self.logger(self.xterm_titles, msg) |
| 104 |
writemsg_level(msg + "\n") |
Archives