diff options
| author | dol-sen <brian.dolbec@gmail.com> | 2011-07-12 12:48:40 -0700 |
|---|---|---|
| committer | dol-sen <brian.dolbec@gmail.com> | 2011-07-12 12:48:40 -0700 |
| commit | 76fb866e094ebefb2ba57f230d5e26f96346e3d4 (patch) | |
| tree | 456ddd1a5b2463d83d6aa49cfbf35fe2105a4300 /layman | |
| parent | c5c3121331d8f2f2b39b8f41b91d705d197be250 (diff) | |
| parent | 36b0e7f01af24ed622d7ebab1bda9ad00ab8dcfc (diff) | |
| download | layman-76fb866e094ebefb2ba57f230d5e26f96346e3d4.tar.gz layman-76fb866e094ebefb2ba57f230d5e26f96346e3d4.tar.bz2 layman-76fb866e094ebefb2ba57f230d5e26f96346e3d4.zip | |
Revert "fix mistracking success adding an overlay."
This reverts commit c5c3121331d8f2f2b39b8f41b91d705d197be250.
Diffstat (limited to 'layman')
| -rw-r--r-- | layman/api.py | 17 | ||||
| -rw-r--r-- | layman/db.py | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/layman/api.py b/layman/api.py index a924ead..8e54d7d 100644 --- a/layman/api.py +++ b/layman/api.py @@ -114,14 +114,14 @@ class LaymanAPI(object): self._error("Repository '"+ovl+"' was not installed") results.append(False) continue - success = False try: - success = self._get_installed_db().delete( + self._get_installed_db().delete( self._get_installed_db().select(ovl)) + results.append(True) except Exception as e: self._error( - "Exception caught disabling repository '"+ovl+"':\n"+str(e)) - results.append(success) + "Failed to disable repository '"+ovl+"':\n"+str(e)) + results.append(False) self.get_installed(dbreload=True) if False in results: return False @@ -147,13 +147,12 @@ class LaymanAPI(object): self._error(UnknownOverlayMessage(ovl)) results.append(False) continue - success = False try: - success = self._get_installed_db().add( - self._get_remote_db().select(ovl), quiet=True) + self._get_installed_db().add(self._get_remote_db().select(ovl), quiet=True) + results.append(True) except Exception as e: - self._error("Exception caught enabling repository '"+ovl+"' : "+str(e)) - results.append(success) + self._error("Failed to enable repository '"+ovl+"' : "+str(e)) + results.append(False) self.get_installed(dbreload=True) if False in results: return False diff --git a/layman/db.py b/layman/db.py index b1df906..3ed5cc6 100644 --- a/layman/db.py +++ b/layman/db.py @@ -206,9 +206,7 @@ class DB(DbBase): self.write(self.path) make_conf.delete(overlay) else: - self.output.error('No local overlay named "' + overlay.name + '"!') - return False - return True + raise Exception('No local overlay named "' + overlay.name + '"!') def sync(self, overlay_name, quiet = False): '''Synchronize the given overlay.''' |