From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QgiEF-00078P-6P for garchives@archives.gentoo.org; Tue, 12 Jul 2011 19:02:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 148F621C059; Tue, 12 Jul 2011 19:02:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D5B9621C059 for ; Tue, 12 Jul 2011 19:02:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C3DE2AC21F for ; Tue, 12 Jul 2011 19:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6A8EA80051 for ; Tue, 12 Jul 2011 19:02:33 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <36b0e7f01af24ed622d7ebab1bda9ad00ab8dcfc.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/api.py layman/db.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 36b0e7f01af24ed622d7ebab1bda9ad00ab8dcfc Date: Tue, 12 Jul 2011 19:02:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 990bf92348a857f341a52bf7744577ff commit: 36b0e7f01af24ed622d7ebab1bda9ad00ab8dcfc Author: dol-sen gmail com> AuthorDate: Tue Jul 12 19:01:43 2011 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Jul 12 19:01:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3D36b0e7f0 fix an errant mistracking of the success of adding an overlay. --- layman/api.py | 12 +++++------- layman/db.py | 4 +++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/layman/api.py b/layman/api.py index 8e54d7d..b494b58 100644 --- a/layman/api.py +++ b/layman/api.py @@ -115,9 +115,9 @@ class LaymanAPI(object): results.append(False) continue try: - self._get_installed_db().delete( + success =3D self._get_installed_db().delete( self._get_installed_db().select(ovl)) - results.append(True) + results.append(success) except Exception as e: self._error( "Failed to disable repository '"+ovl+"':\n"+str(= e)) @@ -147,12 +147,10 @@ class LaymanAPI(object): self._error(UnknownOverlayMessage(ovl)) results.append(False) continue - try: - self._get_installed_db().add(self._get_remote_db().selec= t(ovl), quiet=3DTrue) - results.append(True) - except Exception as e: + success =3D self._get_installed_db().add(self._get_remote_db= ().select(ovl), quiet=3DTrue) + results.append(success) + if not success: self._error("Failed to enable repository '"+ovl+"' : "+s= tr(e)) - results.append(False) self.get_installed(dbreload=3DTrue) if False in results: return False diff --git a/layman/db.py b/layman/db.py index 3ed5cc6..b1df906 100644 --- a/layman/db.py +++ b/layman/db.py @@ -206,7 +206,9 @@ class DB(DbBase): self.write(self.path) make_conf.delete(overlay) else: - raise Exception('No local overlay named "' + overlay.name + = '"!') + self.output.error('No local overlay named "' + overlay.name = + '"!') + return False + return True =20 def sync(self, overlay_name, quiet =3D False): '''Synchronize the given overlay.'''