| 1 |
commit: 2812cf483e10b3f3a1dddc6f931192509dbbd36c |
| 2 |
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon May 2 05:07:10 2011 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon May 2 05:23:47 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=2812cf48 |
| 7 |
|
| 8 |
fix bug 363797 python-2.5 test errors cherypicked from 1.4.x branch |
| 9 |
|
| 10 |
--- |
| 11 |
layman/overlays/bzr.py | 4 ++-- |
| 12 |
layman/overlays/cvs.py | 4 ++-- |
| 13 |
layman/overlays/darcs.py | 4 ++-- |
| 14 |
layman/overlays/g_common.py | 4 ++-- |
| 15 |
layman/overlays/git.py | 4 ++-- |
| 16 |
layman/overlays/mercurial.py | 4 ++-- |
| 17 |
layman/overlays/rsync.py | 2 +- |
| 18 |
layman/overlays/source.py | 4 ++-- |
| 19 |
layman/overlays/svn.py | 4 ++-- |
| 20 |
layman/overlays/tar.py | 2 +- |
| 21 |
10 files changed, 18 insertions(+), 18 deletions(-) |
| 22 |
|
| 23 |
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py |
| 24 |
index af313ef..b251559 100644 |
| 25 |
--- a/layman/overlays/bzr.py |
| 26 |
+++ b/layman/overlays/bzr.py |
| 27 |
@@ -62,7 +62,7 @@ class BzrOverlay(OverlaySource): |
| 28 |
else: |
| 29 |
args = ['get', self.src + '/', target] |
| 30 |
return self.postsync( |
| 31 |
- self.run_command(self.command(), *args, cmd=self.type), |
| 32 |
+ self.run_command(self.command(), args, cmd=self.type), |
| 33 |
cwd=target) |
| 34 |
|
| 35 |
def sync(self, base, quiet = False): |
| 36 |
@@ -80,7 +80,7 @@ class BzrOverlay(OverlaySource): |
| 37 |
else: |
| 38 |
args = ['pull', '--overwrite', self.src] |
| 39 |
return self.postsync( |
| 40 |
- self.run_command(self.command(), *args, cwd=target, cmd=self.type), |
| 41 |
+ self.run_command(self.command(), args, cwd=target, cmd=self.type), |
| 42 |
cwd=target) |
| 43 |
|
| 44 |
def supported(self): |
| 45 |
|
| 46 |
diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py |
| 47 |
index edf164c..c6660d0 100644 |
| 48 |
--- a/layman/overlays/cvs.py |
| 49 |
+++ b/layman/overlays/cvs.py |
| 50 |
@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource): |
| 51 |
args.append(self.subpath) |
| 52 |
|
| 53 |
return self.postsync( |
| 54 |
- self.run_command(self.command(), *args, cwd=base, |
| 55 |
+ self.run_command(self.command(), args, cwd=base, |
| 56 |
env=dict(CVSROOT=self.src), cmd=self.type), |
| 57 |
cwd=target) |
| 58 |
|
| 59 |
@@ -105,7 +105,7 @@ class CvsOverlay(OverlaySource): |
| 60 |
if len(cfg_opts): |
| 61 |
args.append(cfg_opts) |
| 62 |
return self.postsync( |
| 63 |
- self.run_command(self.command(), *args, cwd=target, cmd=self.type), |
| 64 |
+ self.run_command(self.command(), args, cwd=target, cmd=self.type), |
| 65 |
cwd=target) |
| 66 |
|
| 67 |
def supported(self): |
| 68 |
|
| 69 |
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py |
| 70 |
index ce1dbb7..e566f9c 100644 |
| 71 |
--- a/layman/overlays/darcs.py |
| 72 |
+++ b/layman/overlays/darcs.py |
| 73 |
@@ -63,7 +63,7 @@ class DarcsOverlay(OverlaySource): |
| 74 |
self.src + '/', target] |
| 75 |
|
| 76 |
return self.postsync( |
| 77 |
- self.run_command(self.command(), *args, cmd=self.type), |
| 78 |
+ self.run_command(self.command(), args, cmd=self.type), |
| 79 |
cwd=target) |
| 80 |
|
| 81 |
def sync(self, base, quiet = False): |
| 82 |
@@ -81,7 +81,7 @@ class DarcsOverlay(OverlaySource): |
| 83 |
else: |
| 84 |
args = ['pull', '--all', self.src] |
| 85 |
return self.postsync( |
| 86 |
- self.run_command(self.command(), *args, cwd=target, cmd=self.type), |
| 87 |
+ self.run_command(self.command(), args, cwd=target, cmd=self.type), |
| 88 |
cwd=target) |
| 89 |
|
| 90 |
def supported(self): |
| 91 |
|
| 92 |
diff --git a/layman/overlays/g_common.py b/layman/overlays/g_common.py |
| 93 |
index 85b079b..00635b3 100644 |
| 94 |
--- a/layman/overlays/g_common.py |
| 95 |
+++ b/layman/overlays/g_common.py |
| 96 |
@@ -66,12 +66,12 @@ class GCommonOverlay(OverlaySource): |
| 97 |
target = path([base, self.parent.name]) |
| 98 |
|
| 99 |
args = [target, 'sync', self.driver, self.remote_uri] |
| 100 |
- returncode = self.run_command(self.command(), *args, cwd=target) |
| 101 |
+ returncode = self.run_command(self.command(), args, cwd=target) |
| 102 |
if returncode: |
| 103 |
return returncode |
| 104 |
args = [target, 'generate-tree'] |
| 105 |
return self.postsync( |
| 106 |
- self.run_command(self.command(), *args, cwd=target, cmd=self.type), |
| 107 |
+ self.run_command(self.command(), args, cwd=target, cmd=self.type), |
| 108 |
cwd=target) |
| 109 |
|
| 110 |
def supported(self): |
| 111 |
|
| 112 |
diff --git a/layman/overlays/git.py b/layman/overlays/git.py |
| 113 |
index 3ded205..0832699 100644 |
| 114 |
--- a/layman/overlays/git.py |
| 115 |
+++ b/layman/overlays/git.py |
| 116 |
@@ -67,7 +67,7 @@ class GitOverlay(OverlaySource): |
| 117 |
args.append(fix_git_source(self.src)) |
| 118 |
args.append(target) |
| 119 |
return self.postsync( |
| 120 |
- self.run_command(self.command(), *args, cmd=self.type), |
| 121 |
+ self.run_command(self.command(), args, cmd=self.type), |
| 122 |
cwd=target) |
| 123 |
|
| 124 |
def sync(self, base, quiet = False): |
| 125 |
@@ -86,7 +86,7 @@ class GitOverlay(OverlaySource): |
| 126 |
args.append(cfg_opts) |
| 127 |
|
| 128 |
return self.postsync( |
| 129 |
- self.run_command(self.command(), *args, cwd=target, cmd=self.type), |
| 130 |
+ self.run_command(self.command(), args, cwd=target, cmd=self.type), |
| 131 |
cwd=target) |
| 132 |
|
| 133 |
def supported(self): |
| 134 |
|
| 135 |
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py |
| 136 |
index 53d73e9..316590d 100644 |
| 137 |
--- a/layman/overlays/mercurial.py |
| 138 |
+++ b/layman/overlays/mercurial.py |
| 139 |
@@ -62,7 +62,7 @@ class MercurialOverlay(OverlaySource): |
| 140 |
args = ['clone', self.src + '/', target] |
| 141 |
|
| 142 |
return self.postsync( |
| 143 |
- self.run_command(self.command(), *args, cmd=self.type), |
| 144 |
+ self.run_command(self.command(), args, cmd=self.type), |
| 145 |
cwd=target) |
| 146 |
|
| 147 |
def sync(self, base, quiet = False): |
| 148 |
@@ -81,7 +81,7 @@ class MercurialOverlay(OverlaySource): |
| 149 |
args = ['pull', '-u', self.src] |
| 150 |
|
| 151 |
return self.postsync( |
| 152 |
- self.run_command(self.command(), *args, cwd=target, cmd=self.type), |
| 153 |
+ self.run_command(self.command(), args, cwd=target, cmd=self.type), |
| 154 |
cwd=target) |
| 155 |
|
| 156 |
def supported(self): |
| 157 |
|
| 158 |
diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py |
| 159 |
index 8243c09..3090c77 100644 |
| 160 |
--- a/layman/overlays/rsync.py |
| 161 |
+++ b/layman/overlays/rsync.py |
| 162 |
@@ -77,7 +77,7 @@ class RsyncOverlay(OverlaySource): |
| 163 |
args.append(target) |
| 164 |
|
| 165 |
return self.postsync( |
| 166 |
- self.run_command(self.command(), *args, cmd=self.type), |
| 167 |
+ self.run_command(self.command(), args, cmd=self.type), |
| 168 |
cwd=target) |
| 169 |
|
| 170 |
def supported(self): |
| 171 |
|
| 172 |
diff --git a/layman/overlays/source.py b/layman/overlays/source.py |
| 173 |
index a845266..b833fd2 100644 |
| 174 |
--- a/layman/overlays/source.py |
| 175 |
+++ b/layman/overlays/source.py |
| 176 |
@@ -111,9 +111,9 @@ class OverlaySource(object): |
| 177 |
def command(self): |
| 178 |
return self.config['%s_command' % self.__class__.type_key] |
| 179 |
|
| 180 |
- def run_command(self, command, *args, **kwargs): |
| 181 |
+ def run_command(self, command, args, **kwargs): |
| 182 |
file_to_run = _resolve_command(command, self.output.error)[1] |
| 183 |
- args = (file_to_run, ) + args |
| 184 |
+ args = [file_to_run] + args |
| 185 |
assert('pwd' not in kwargs) # Bug detector |
| 186 |
|
| 187 |
cwd = kwargs.get('cwd', None) |
| 188 |
|
| 189 |
diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py |
| 190 |
index 7e27d12..c64be62 100644 |
| 191 |
--- a/layman/overlays/svn.py |
| 192 |
+++ b/layman/overlays/svn.py |
| 193 |
@@ -65,7 +65,7 @@ class SvnOverlay(OverlaySource): |
| 194 |
args.append(target) |
| 195 |
|
| 196 |
return self.postsync( |
| 197 |
- self.run_command(self.command(),*args, cmd=self.type), |
| 198 |
+ self.run_command(self.command(), args, cmd=self.type), |
| 199 |
cwd=target) |
| 200 |
|
| 201 |
def sync(self, base, quiet = False): |
| 202 |
@@ -94,7 +94,7 @@ class SvnOverlay(OverlaySource): |
| 203 |
args.append(target) |
| 204 |
|
| 205 |
return self.postsync( |
| 206 |
- self.run_command(self.command(),*args, cmd=self.type), |
| 207 |
+ self.run_command(self.command(), args, cmd=self.type), |
| 208 |
cwd=target) |
| 209 |
|
| 210 |
def supported(self): |
| 211 |
|
| 212 |
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py |
| 213 |
index a759332..ac030d8 100644 |
| 214 |
--- a/layman/overlays/tar.py |
| 215 |
+++ b/layman/overlays/tar.py |
| 216 |
@@ -123,7 +123,7 @@ class TarOverlay(OverlaySource): |
| 217 |
|
| 218 |
# tar -v -x -f SOURCE -C TARGET |
| 219 |
args = ['-v', '-x', '-f', pkg, '-C', dest_dir] |
| 220 |
- result = self.run_command(self.command(), *args, cmd=self.type) |
| 221 |
+ result = self.run_command(self.command(), args, cmd=self.type) |
| 222 |
|
| 223 |
os.unlink(pkg) |
| 224 |
return result |
| 225 |
|
| 226 |
diff --git a/layman/tests/dtest.py b/layman/tests/dtest.py |
| 227 |
old mode 100644 |
| 228 |
new mode 100755 |
| 229 |
|
| 230 |
diff --git a/layman/tests/external.py b/layman/tests/external.py |
| 231 |
old mode 100644 |
| 232 |
new mode 100755 |
Archives