Fix supported() use to return 1 if it is not supported.

This is a continuation of the move away from raising exceptions for everything.

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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["bzr_addopts"]
         target = path([base, self.parent.name])
@@ -67,7 +68,8 @@ class BzrOverlay(OverlaySource):
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["bzr_syncopts"]
         target = 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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["cvs_addopts"]
         target = path([base, self.parent.name])
@@ -89,7 +90,8 @@ class CvsOverlay(OverlaySource):
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["cvs_syncopts"]
         target = 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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["darcs_addopts"]
         target = path([base, self.parent.name])
@@ -68,7 +69,8 @@ class DarcsOverlay(OverlaySource):
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["darcs_addopts"]
         target = 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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
+
         target = path([base, self.parent.name])
 
         os.makedirs(target)
@@ -58,7 +60,9 @@ class GCommonOverlay(OverlaySource):
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
+
         target = path([base, self.parent.name])
 
         args = [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.'''
 
         if not self.supported():
-            return False
+            return 1
 
         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 = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["git_syncopts"]
         target = 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=target, cmd=self.type),
             cwd=target)
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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["mercurial_addopts"]
         target = path([base, self.parent.name])
@@ -67,7 +68,8 @@ class MercurialOverlay(OverlaySource):
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         cfg_opts = self.config["mercurial_syncopts"]
         target = 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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         super(RsyncOverlay, self).add(base)
 
@@ -57,7 +58,8 @@ class RsyncOverlay(OverlaySource):
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         # rsync OPTIONS [-q] SOURCE TARGET
         args = ['-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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         super(SvnOverlay, self).add(base)
 
@@ -70,7 +71,8 @@ class SvnOverlay(OverlaySource):
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         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 = False):
         '''Add overlay.'''
 
-        self.supported()
+        if not self.supported():
+            return 1
 
         target = path([base, self.parent.name])
 
@@ -190,7 +191,10 @@ class TarOverlay(OverlaySource):
 
     def sync(self, base, quiet = False):
         '''Sync overlay.'''
-        self.supported()
+
+        if not self.supported():
+            return 1
+
         target = path([base, self.parent.name])
 
         return self.postsync(