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 1QG3o4-0007QC-9y for garchives@archives.gentoo.org; Sat, 30 Apr 2011 06:37:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80ADA1C00E; Sat, 30 Apr 2011 06:37:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 302371C00E for ; Sat, 30 Apr 2011 06:37:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BDD41B402F for ; Sat, 30 Apr 2011 06:37:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C209180507 for ; Sat, 30 Apr 2011 06:37:22 +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: <51424bf1f0aa7734dfc45672a5c6ae9ef10cbb6e.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/overlays/ X-VCS-Repository: proj/layman X-VCS-Files: layman/overlays/bzr.py layman/overlays/cvs.py layman/overlays/darcs.py layman/overlays/g_common.py layman/overlays/git.py layman/overlays/mercurial.py layman/overlays/rsync.py layman/overlays/svn.py layman/overlays/tar.py X-VCS-Directories: layman/overlays/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 51424bf1f0aa7734dfc45672a5c6ae9ef10cbb6e Date: Sat, 30 Apr 2011 06:37:22 +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: 5b15e742c9f1826df1a0ce86b123a0e9 commit: 51424bf1f0aa7734dfc45672a5c6ae9ef10cbb6e Author: dol-sen gmail com> AuthorDate: Sat Apr 30 06:35:32 2011 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Apr 30 06:35:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/layman.git;a=3D= commit;h=3D51424bf1 Fix supported() use to return 1 if it is not supported. This is a continuation of the move away from raising exceptions for every= thing. --- layman/overlays/bzr.py | 6 ++++-- layman/overlays/cvs.py | 6 ++++-- layman/overlays/darcs.py | 6 ++++-- layman/overlays/g_common.py | 8 ++++++-- layman/overlays/git.py | 6 ++++-- layman/overlays/mercurial.py | 6 ++++-- layman/overlays/rsync.py | 6 ++++-- layman/overlays/svn.py | 6 ++++-- layman/overlays/tar.py | 8 ++++++-- 9 files changed, 40 insertions(+), 18 deletions(-) diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py index ec57a7b..af313ef 100644 --- a/layman/overlays/bzr.py +++ b/layman/overlays/bzr.py @@ -49,7 +49,8 @@ class BzrOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["bzr_addopts"] target =3D path([base, self.parent.name]) @@ -67,7 +68,8 @@ class BzrOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["bzr_syncopts"] target =3D path([base, self.parent.name]) diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py index 15a6c97..edf164c 100644 --- a/layman/overlays/cvs.py +++ b/layman/overlays/cvs.py @@ -65,7 +65,8 @@ class CvsOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["cvs_addopts"] target =3D path([base, self.parent.name]) @@ -89,7 +90,8 @@ class CvsOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["cvs_syncopts"] target =3D path([base, self.parent.name]) diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py index 358db2d..ce1dbb7 100644 --- a/layman/overlays/darcs.py +++ b/layman/overlays/darcs.py @@ -48,7 +48,8 @@ class DarcsOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["darcs_addopts"] target =3D path([base, self.parent.name]) @@ -68,7 +69,8 @@ class DarcsOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["darcs_addopts"] target =3D path([base, self.parent.name]) diff --git a/layman/overlays/g_common.py b/layman/overlays/g_common.py index fae11df..85b079b 100644 --- a/layman/overlays/g_common.py +++ b/layman/overlays/g_common.py @@ -48,7 +48,9 @@ class GCommonOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 + target =3D path([base, self.parent.name]) =20 os.makedirs(target) @@ -58,7 +60,9 @@ class GCommonOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 + target =3D path([base, self.parent.name]) =20 args =3D [target, 'sync', self.driver, self.remote_uri] diff --git a/layman/overlays/git.py b/layman/overlays/git.py index 1825f92..3ded205 100644 --- a/layman/overlays/git.py +++ b/layman/overlays/git.py @@ -47,7 +47,7 @@ class GitOverlay(OverlaySource): '''Add overlay.''' =20 if not self.supported(): - return False + return 1 =20 def fix_git_source(source): # http:// should get trailing slash, other protocols shouldn= 't @@ -73,7 +73,8 @@ class GitOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["git_syncopts"] target =3D path([base, self.parent.name]) @@ -83,6 +84,7 @@ class GitOverlay(OverlaySource): args.append('-q') if len(cfg_opts): args.append(cfg_opts) + return self.postsync( self.run_command(self.command(), *args, cwd=3Dtarget, cmd=3D= self.type), cwd=3Dtarget) diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py index c6a9fce..53d73e9 100644 --- a/layman/overlays/mercurial.py +++ b/layman/overlays/mercurial.py @@ -49,7 +49,8 @@ class MercurialOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["mercurial_addopts"] target =3D path([base, self.parent.name]) @@ -67,7 +68,8 @@ class MercurialOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 cfg_opts =3D self.config["mercurial_syncopts"] target =3D path([base, self.parent.name]) diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py index d282b35..8243c09 100644 --- a/layman/overlays/rsync.py +++ b/layman/overlays/rsync.py @@ -48,7 +48,8 @@ class RsyncOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 super(RsyncOverlay, self).add(base) =20 @@ -57,7 +58,8 @@ class RsyncOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 # rsync OPTIONS [-q] SOURCE TARGET args =3D ['-rlptDvz', '--progress', '--delete', '--delete-after'= , diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py index 6b124a3..7e27d12 100644 --- a/layman/overlays/svn.py +++ b/layman/overlays/svn.py @@ -48,7 +48,8 @@ class SvnOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 super(SvnOverlay, self).add(base) =20 @@ -70,7 +71,8 @@ class SvnOverlay(OverlaySource): def sync(self, base, quiet =3D False): '''Sync overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 def checkout_location(): # Append '@' iff needed diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py index 204a626..a759332 100644 --- a/layman/overlays/tar.py +++ b/layman/overlays/tar.py @@ -176,7 +176,8 @@ class TarOverlay(OverlaySource): def add(self, base, quiet =3D False): '''Add overlay.''' =20 - self.supported() + if not self.supported(): + return 1 =20 target =3D path([base, self.parent.name]) =20 @@ -190,7 +191,10 @@ class TarOverlay(OverlaySource): =20 def sync(self, base, quiet =3D False): '''Sync overlay.''' - self.supported() + + if not self.supported(): + return 1 + target =3D path([base, self.parent.name]) =20 return self.postsync(