| 1 |
commit: 51424bf1f0aa7734dfc45672a5c6ae9ef10cbb6e |
| 2 |
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 30 06:35:32 2011 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Apr 30 06:35:32 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=51424bf1 |
| 7 |
|
| 8 |
Fix supported() use to return 1 if it is not supported. |
| 9 |
This is a continuation of the move away from raising exceptions for everything. |
| 10 |
|
| 11 |
--- |
| 12 |
layman/overlays/bzr.py | 6 ++++-- |
| 13 |
layman/overlays/cvs.py | 6 ++++-- |
| 14 |
layman/overlays/darcs.py | 6 ++++-- |
| 15 |
layman/overlays/g_common.py | 8 ++++++-- |
| 16 |
layman/overlays/git.py | 6 ++++-- |
| 17 |
layman/overlays/mercurial.py | 6 ++++-- |
| 18 |
layman/overlays/rsync.py | 6 ++++-- |
| 19 |
layman/overlays/svn.py | 6 ++++-- |
| 20 |
layman/overlays/tar.py | 8 ++++++-- |
| 21 |
9 files changed, 40 insertions(+), 18 deletions(-) |
| 22 |
|
| 23 |
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py |
| 24 |
index ec57a7b..af313ef 100644 |
| 25 |
--- a/layman/overlays/bzr.py |
| 26 |
+++ b/layman/overlays/bzr.py |
| 27 |
@@ -49,7 +49,8 @@ class BzrOverlay(OverlaySource): |
| 28 |
def add(self, base, quiet = False): |
| 29 |
'''Add overlay.''' |
| 30 |
|
| 31 |
- self.supported() |
| 32 |
+ if not self.supported(): |
| 33 |
+ return 1 |
| 34 |
|
| 35 |
cfg_opts = self.config["bzr_addopts"] |
| 36 |
target = path([base, self.parent.name]) |
| 37 |
@@ -67,7 +68,8 @@ class BzrOverlay(OverlaySource): |
| 38 |
def sync(self, base, quiet = False): |
| 39 |
'''Sync overlay.''' |
| 40 |
|
| 41 |
- self.supported() |
| 42 |
+ if not self.supported(): |
| 43 |
+ return 1 |
| 44 |
|
| 45 |
cfg_opts = self.config["bzr_syncopts"] |
| 46 |
target = path([base, self.parent.name]) |
| 47 |
|
| 48 |
diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py |
| 49 |
index 15a6c97..edf164c 100644 |
| 50 |
--- a/layman/overlays/cvs.py |
| 51 |
+++ b/layman/overlays/cvs.py |
| 52 |
@@ -65,7 +65,8 @@ class CvsOverlay(OverlaySource): |
| 53 |
def add(self, base, quiet = False): |
| 54 |
'''Add overlay.''' |
| 55 |
|
| 56 |
- self.supported() |
| 57 |
+ if not self.supported(): |
| 58 |
+ return 1 |
| 59 |
|
| 60 |
cfg_opts = self.config["cvs_addopts"] |
| 61 |
target = path([base, self.parent.name]) |
| 62 |
@@ -89,7 +90,8 @@ class CvsOverlay(OverlaySource): |
| 63 |
def sync(self, base, quiet = False): |
| 64 |
'''Sync overlay.''' |
| 65 |
|
| 66 |
- self.supported() |
| 67 |
+ if not self.supported(): |
| 68 |
+ return 1 |
| 69 |
|
| 70 |
cfg_opts = self.config["cvs_syncopts"] |
| 71 |
target = path([base, self.parent.name]) |
| 72 |
|
| 73 |
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py |
| 74 |
index 358db2d..ce1dbb7 100644 |
| 75 |
--- a/layman/overlays/darcs.py |
| 76 |
+++ b/layman/overlays/darcs.py |
| 77 |
@@ -48,7 +48,8 @@ class DarcsOverlay(OverlaySource): |
| 78 |
def add(self, base, quiet = False): |
| 79 |
'''Add overlay.''' |
| 80 |
|
| 81 |
- self.supported() |
| 82 |
+ if not self.supported(): |
| 83 |
+ return 1 |
| 84 |
|
| 85 |
cfg_opts = self.config["darcs_addopts"] |
| 86 |
target = path([base, self.parent.name]) |
| 87 |
@@ -68,7 +69,8 @@ class DarcsOverlay(OverlaySource): |
| 88 |
def sync(self, base, quiet = False): |
| 89 |
'''Sync overlay.''' |
| 90 |
|
| 91 |
- self.supported() |
| 92 |
+ if not self.supported(): |
| 93 |
+ return 1 |
| 94 |
|
| 95 |
cfg_opts = self.config["darcs_addopts"] |
| 96 |
target = path([base, self.parent.name]) |
| 97 |
|
| 98 |
diff --git a/layman/overlays/g_common.py b/layman/overlays/g_common.py |
| 99 |
index fae11df..85b079b 100644 |
| 100 |
--- a/layman/overlays/g_common.py |
| 101 |
+++ b/layman/overlays/g_common.py |
| 102 |
@@ -48,7 +48,9 @@ class GCommonOverlay(OverlaySource): |
| 103 |
def add(self, base, quiet = False): |
| 104 |
'''Add overlay.''' |
| 105 |
|
| 106 |
- self.supported() |
| 107 |
+ if not self.supported(): |
| 108 |
+ return 1 |
| 109 |
+ |
| 110 |
target = path([base, self.parent.name]) |
| 111 |
|
| 112 |
os.makedirs(target) |
| 113 |
@@ -58,7 +60,9 @@ class GCommonOverlay(OverlaySource): |
| 114 |
def sync(self, base, quiet = False): |
| 115 |
'''Sync overlay.''' |
| 116 |
|
| 117 |
- self.supported() |
| 118 |
+ if not self.supported(): |
| 119 |
+ return 1 |
| 120 |
+ |
| 121 |
target = path([base, self.parent.name]) |
| 122 |
|
| 123 |
args = [target, 'sync', self.driver, self.remote_uri] |
| 124 |
|
| 125 |
diff --git a/layman/overlays/git.py b/layman/overlays/git.py |
| 126 |
index 1825f92..3ded205 100644 |
| 127 |
--- a/layman/overlays/git.py |
| 128 |
+++ b/layman/overlays/git.py |
| 129 |
@@ -47,7 +47,7 @@ class GitOverlay(OverlaySource): |
| 130 |
'''Add overlay.''' |
| 131 |
|
| 132 |
if not self.supported(): |
| 133 |
- return False |
| 134 |
+ return 1 |
| 135 |
|
| 136 |
def fix_git_source(source): |
| 137 |
# http:// should get trailing slash, other protocols shouldn't |
| 138 |
@@ -73,7 +73,8 @@ class GitOverlay(OverlaySource): |
| 139 |
def sync(self, base, quiet = False): |
| 140 |
'''Sync overlay.''' |
| 141 |
|
| 142 |
- self.supported() |
| 143 |
+ if not self.supported(): |
| 144 |
+ return 1 |
| 145 |
|
| 146 |
cfg_opts = self.config["git_syncopts"] |
| 147 |
target = path([base, self.parent.name]) |
| 148 |
@@ -83,6 +84,7 @@ class GitOverlay(OverlaySource): |
| 149 |
args.append('-q') |
| 150 |
if len(cfg_opts): |
| 151 |
args.append(cfg_opts) |
| 152 |
+ |
| 153 |
return self.postsync( |
| 154 |
self.run_command(self.command(), *args, cwd=target, cmd=self.type), |
| 155 |
cwd=target) |
| 156 |
|
| 157 |
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py |
| 158 |
index c6a9fce..53d73e9 100644 |
| 159 |
--- a/layman/overlays/mercurial.py |
| 160 |
+++ b/layman/overlays/mercurial.py |
| 161 |
@@ -49,7 +49,8 @@ class MercurialOverlay(OverlaySource): |
| 162 |
def add(self, base, quiet = False): |
| 163 |
'''Add overlay.''' |
| 164 |
|
| 165 |
- self.supported() |
| 166 |
+ if not self.supported(): |
| 167 |
+ return 1 |
| 168 |
|
| 169 |
cfg_opts = self.config["mercurial_addopts"] |
| 170 |
target = path([base, self.parent.name]) |
| 171 |
@@ -67,7 +68,8 @@ class MercurialOverlay(OverlaySource): |
| 172 |
def sync(self, base, quiet = False): |
| 173 |
'''Sync overlay.''' |
| 174 |
|
| 175 |
- self.supported() |
| 176 |
+ if not self.supported(): |
| 177 |
+ return 1 |
| 178 |
|
| 179 |
cfg_opts = self.config["mercurial_syncopts"] |
| 180 |
target = path([base, self.parent.name]) |
| 181 |
|
| 182 |
diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py |
| 183 |
index d282b35..8243c09 100644 |
| 184 |
--- a/layman/overlays/rsync.py |
| 185 |
+++ b/layman/overlays/rsync.py |
| 186 |
@@ -48,7 +48,8 @@ class RsyncOverlay(OverlaySource): |
| 187 |
def add(self, base, quiet = False): |
| 188 |
'''Add overlay.''' |
| 189 |
|
| 190 |
- self.supported() |
| 191 |
+ if not self.supported(): |
| 192 |
+ return 1 |
| 193 |
|
| 194 |
super(RsyncOverlay, self).add(base) |
| 195 |
|
| 196 |
@@ -57,7 +58,8 @@ class RsyncOverlay(OverlaySource): |
| 197 |
def sync(self, base, quiet = False): |
| 198 |
'''Sync overlay.''' |
| 199 |
|
| 200 |
- self.supported() |
| 201 |
+ if not self.supported(): |
| 202 |
+ return 1 |
| 203 |
|
| 204 |
# rsync OPTIONS [-q] SOURCE TARGET |
| 205 |
args = ['-rlptDvz', '--progress', '--delete', '--delete-after', |
| 206 |
|
| 207 |
diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py |
| 208 |
index 6b124a3..7e27d12 100644 |
| 209 |
--- a/layman/overlays/svn.py |
| 210 |
+++ b/layman/overlays/svn.py |
| 211 |
@@ -48,7 +48,8 @@ class SvnOverlay(OverlaySource): |
| 212 |
def add(self, base, quiet = False): |
| 213 |
'''Add overlay.''' |
| 214 |
|
| 215 |
- self.supported() |
| 216 |
+ if not self.supported(): |
| 217 |
+ return 1 |
| 218 |
|
| 219 |
super(SvnOverlay, self).add(base) |
| 220 |
|
| 221 |
@@ -70,7 +71,8 @@ class SvnOverlay(OverlaySource): |
| 222 |
def sync(self, base, quiet = False): |
| 223 |
'''Sync overlay.''' |
| 224 |
|
| 225 |
- self.supported() |
| 226 |
+ if not self.supported(): |
| 227 |
+ return 1 |
| 228 |
|
| 229 |
def checkout_location(): |
| 230 |
# Append '@' iff needed |
| 231 |
|
| 232 |
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py |
| 233 |
index 204a626..a759332 100644 |
| 234 |
--- a/layman/overlays/tar.py |
| 235 |
+++ b/layman/overlays/tar.py |
| 236 |
@@ -176,7 +176,8 @@ class TarOverlay(OverlaySource): |
| 237 |
def add(self, base, quiet = False): |
| 238 |
'''Add overlay.''' |
| 239 |
|
| 240 |
- self.supported() |
| 241 |
+ if not self.supported(): |
| 242 |
+ return 1 |
| 243 |
|
| 244 |
target = path([base, self.parent.name]) |
| 245 |
|
| 246 |
@@ -190,7 +191,10 @@ class TarOverlay(OverlaySource): |
| 247 |
|
| 248 |
def sync(self, base, quiet = False): |
| 249 |
'''Sync overlay.''' |
| 250 |
- self.supported() |
| 251 |
+ |
| 252 |
+ if not self.supported(): |
| 253 |
+ return 1 |
| 254 |
+ |
| 255 |
target = path([base, self.parent.name]) |
| 256 |
|
| 257 |
return self.postsync( |
Archives