| 1 |
commit: 091147c6abb9bdfa814a8fc571b6cad85669fa46 |
| 2 |
Author: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Feb 24 06:13:04 2011 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sun Mar 27 02:39:00 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=091147c6 |
| 7 |
|
| 8 |
remove a few raise Exception()'s and replace them with self.output.error messages. |
| 9 |
wrap the make_Conf in a config check. |
| 10 |
|
| 11 |
--- |
| 12 |
layman/db.py | 29 +++++++++++++++++++---------- |
| 13 |
1 files changed, 19 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/layman/db.py b/layman/db.py |
| 16 |
index 01dc454..ed2bb2e 100644 |
| 17 |
--- a/layman/db.py |
| 18 |
+++ b/layman/db.py |
| 19 |
@@ -56,10 +56,10 @@ class DB(DbBase): |
| 20 |
quiet = int(config['quietness']) < 3 |
| 21 |
|
| 22 |
DbBase.__init__(self, |
| 23 |
- [config['local_list'], ], |
| 24 |
config, |
| 25 |
- ignore, |
| 26 |
- quiet) |
| 27 |
+ paths=[config['local_list'], ], |
| 28 |
+ ignore=ignore, |
| 29 |
+ quiet=quiet) |
| 30 |
|
| 31 |
self.output.debug('DB handler initiated', 6) |
| 32 |
|
| 33 |
@@ -119,22 +119,30 @@ class DB(DbBase): |
| 34 |
overlay.set_priority(self.config['priority']) |
| 35 |
self.overlays[overlay.name] = overlay |
| 36 |
self.write(self.path) |
| 37 |
- make_conf = MakeConf(self.config, self.overlays) |
| 38 |
- make_conf.add(overlay) |
| 39 |
+ if self.config['make_config']: |
| 40 |
+ make_conf = MakeConf(self.config, self.overlays) |
| 41 |
+ make_ok = make_conf.add(overlay) |
| 42 |
+ return make_ok |
| 43 |
+ return True |
| 44 |
else: |
| 45 |
mdir = path([self.config['storage'], overlay.name]) |
| 46 |
delete_empty_directory(mdir, self.output) |
| 47 |
if os.path.exists(mdir): |
| 48 |
- raise Exception('Adding overlay "%s" failed!' |
| 49 |
+ self.output.error('Adding repository "%s" failed!' |
| 50 |
' Possible remains of the operation have NOT' |
| 51 |
' been removed and may be left at "%s".' |
| 52 |
' Please remove them manually if required.' \ |
| 53 |
% (overlay.name, mdir)) |
| 54 |
+ return False |
| 55 |
else: |
| 56 |
- raise Exception('Adding overlay "%s" failed!' % overlay.name) |
| 57 |
+ self.output.error( |
| 58 |
+ 'Adding repository "%s" failed!' % overlay.name) |
| 59 |
+ return False |
| 60 |
else: |
| 61 |
- raise Exception('Overlay "' + overlay.name + '" already in the loca' |
| 62 |
- 'l list!') |
| 63 |
+ self.output.error('Repository "' + overlay.name + |
| 64 |
+ '" already in the local (installed) list!') |
| 65 |
+ return False |
| 66 |
+ |
| 67 |
|
| 68 |
def delete(self, overlay): |
| 69 |
''' |
| 70 |
@@ -243,7 +251,8 @@ class RemoteDB(DbBase): |
| 71 |
|
| 72 |
quiet = int(config['quietness']) < 3 |
| 73 |
|
| 74 |
- DbBase.__init__(self, paths, config, ignore, quiet, ignore_init_read_errors) |
| 75 |
+ DbBase.__init__(self, config, paths=paths, ignore=ignore, |
| 76 |
+ quiet=quiet, ignore_init_read_errors=ignore_init_read_errors) |
| 77 |
|
| 78 |
# overrider |
| 79 |
def _broken_catalog_hint(self): |
Archives