| 1 |
commit: 35815463599b2aa843edcc976920d996f6e4b0e2 |
| 2 |
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Apr 27 10:58:06 2011 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Apr 27 10:58:06 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=35815463 |
| 7 |
|
| 8 |
fix broken *args for python 2.5 and 2.6+. |
| 9 |
Also fixes my previous fix & resultant breakage. |
| 10 |
Passes tests for all python versions supported. |
| 11 |
|
| 12 |
--- |
| 13 |
bin/layman | 2 +- |
| 14 |
layman/overlays/bzr.py | 2 +- |
| 15 |
layman/overlays/darcs.py | 2 +- |
| 16 |
layman/overlays/git.py | 2 +- |
| 17 |
layman/overlays/mercurial.py | 2 +- |
| 18 |
layman/overlays/rsync.py | 2 +- |
| 19 |
layman/overlays/source.py | 4 ++-- |
| 20 |
layman/overlays/svn.py | 4 ++-- |
| 21 |
layman/overlays/tar.py | 2 +- |
| 22 |
9 files changed, 11 insertions(+), 11 deletions(-) |
| 23 |
|
| 24 |
diff --git a/bin/layman b/bin/layman |
| 25 |
index b85f4fa..01ee0c8 100755 |
| 26 |
--- a/bin/layman |
| 27 |
+++ b/bin/layman |
| 28 |
@@ -1,4 +1,4 @@ |
| 29 |
-#!python |
| 30 |
+#!/usr/bin/python |
| 31 |
################################################################################ |
| 32 |
# LAYMAN - A UTILITY TO SELECT AND UPDATE GENTOO OVERLAYS |
| 33 |
################################################################################ |
| 34 |
|
| 35 |
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py |
| 36 |
index 4725c98..b59cf6c 100644 |
| 37 |
--- a/layman/overlays/bzr.py |
| 38 |
+++ b/layman/overlays/bzr.py |
| 39 |
@@ -52,7 +52,7 @@ class BzrOverlay(OverlaySource): |
| 40 |
|
| 41 |
# bzr get SOURCE TARGET |
| 42 |
args = ['get', self.src + '/', path([base, self.parent.name])] |
| 43 |
- return self.run_command(*args) |
| 44 |
+ return self.run_command(args) |
| 45 |
|
| 46 |
def sync(self, base, quiet = False): |
| 47 |
'''Sync overlay.''' |
| 48 |
|
| 49 |
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py |
| 50 |
index 12e75ec..c062543 100644 |
| 51 |
--- a/layman/overlays/darcs.py |
| 52 |
+++ b/layman/overlays/darcs.py |
| 53 |
@@ -51,7 +51,7 @@ class DarcsOverlay(OverlaySource): |
| 54 |
|
| 55 |
# darcs get --partial SOURCE TARGET |
| 56 |
args = ['get', '--partial', self.src + '/', path([base, self.parent.name])] |
| 57 |
- return self.run_command(*args) |
| 58 |
+ return self.run_command(args) |
| 59 |
|
| 60 |
def sync(self, base, quiet = False): |
| 61 |
'''Sync overlay.''' |
| 62 |
|
| 63 |
diff --git a/layman/overlays/git.py b/layman/overlays/git.py |
| 64 |
index 8db6c51..3b2608b 100644 |
| 65 |
--- a/layman/overlays/git.py |
| 66 |
+++ b/layman/overlays/git.py |
| 67 |
@@ -60,7 +60,7 @@ class GitOverlay(OverlaySource): |
| 68 |
args.append('-q') |
| 69 |
args.append(fix_git_source(self.src)) |
| 70 |
args.append(path([base, self.parent.name])) |
| 71 |
- return self.run_command(*args) |
| 72 |
+ return self.run_command(args) |
| 73 |
|
| 74 |
def sync(self, base, quiet = False): |
| 75 |
'''Sync overlay.''' |
| 76 |
|
| 77 |
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py |
| 78 |
index ea3f9da..8bf919b 100644 |
| 79 |
--- a/layman/overlays/mercurial.py |
| 80 |
+++ b/layman/overlays/mercurial.py |
| 81 |
@@ -51,7 +51,7 @@ class MercurialOverlay(OverlaySource): |
| 82 |
|
| 83 |
# hg clone SOURCE TARGET |
| 84 |
args = ['clone', self.src + '/', path([base, self.parent.name])] |
| 85 |
- return self.run_command(*args) |
| 86 |
+ return self.run_command(args) |
| 87 |
|
| 88 |
def sync(self, base, quiet = False): |
| 89 |
'''Sync overlay.''' |
| 90 |
|
| 91 |
diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py |
| 92 |
index 3a5a342..bf01462 100644 |
| 93 |
--- a/layman/overlays/rsync.py |
| 94 |
+++ b/layman/overlays/rsync.py |
| 95 |
@@ -66,7 +66,7 @@ class RsyncOverlay(OverlaySource): |
| 96 |
args.append(self.src + '/') |
| 97 |
args.append(path([base, self.parent.name])) |
| 98 |
|
| 99 |
- return self.run_command(*args) |
| 100 |
+ return self.run_command(args) |
| 101 |
|
| 102 |
def supported(self): |
| 103 |
'''Overlay type supported?''' |
| 104 |
|
| 105 |
diff --git a/layman/overlays/source.py b/layman/overlays/source.py |
| 106 |
index 2c039c9..9e7f974 100644 |
| 107 |
--- a/layman/overlays/source.py |
| 108 |
+++ b/layman/overlays/source.py |
| 109 |
@@ -107,9 +107,9 @@ class OverlaySource(object): |
| 110 |
def command(self): |
| 111 |
return self.config['%s_command' % self.__class__.type_key] |
| 112 |
|
| 113 |
- def run_command(self, *args, **kwargs): |
| 114 |
+ def run_command(self, args, **kwargs): |
| 115 |
file_to_run = _resolve_command(self.command())[1] |
| 116 |
- args = (file_to_run, ) + args |
| 117 |
+ args = [file_to_run] + args |
| 118 |
assert('pwd' not in kwargs) # Bug detector |
| 119 |
|
| 120 |
cwd = kwargs.get('cwd', None) |
| 121 |
|
| 122 |
diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py |
| 123 |
index 2a30198..092d786 100644 |
| 124 |
--- a/layman/overlays/svn.py |
| 125 |
+++ b/layman/overlays/svn.py |
| 126 |
@@ -56,7 +56,7 @@ class SvnOverlay(OverlaySource): |
| 127 |
args.append(self.src + '/@') |
| 128 |
args.append(path([base, self.parent.name])) |
| 129 |
|
| 130 |
- return self.run_command(*args) |
| 131 |
+ return self.run_command(args) |
| 132 |
|
| 133 |
def sync(self, base, quiet = False): |
| 134 |
'''Sync overlay.''' |
| 135 |
@@ -77,7 +77,7 @@ class SvnOverlay(OverlaySource): |
| 136 |
args.append('-q') |
| 137 |
args.append(checkout_location()) |
| 138 |
|
| 139 |
- return self.run_command(*args) |
| 140 |
+ return self.run_command(args) |
| 141 |
|
| 142 |
def supported(self): |
| 143 |
'''Overlay type supported?''' |
| 144 |
|
| 145 |
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py |
| 146 |
index 919f4df..612b6b6 100644 |
| 147 |
--- a/layman/overlays/tar.py |
| 148 |
+++ b/layman/overlays/tar.py |
| 149 |
@@ -128,7 +128,7 @@ class TarOverlay(OverlaySource): |
| 150 |
|
| 151 |
# tar -v -x -f SOURCE -C TARGET |
| 152 |
args = ['-v', '-x', '-f', pkg, '-C', dest_dir] |
| 153 |
- result = self.run_command(*args) |
| 154 |
+ result = self.run_command(args) |
| 155 |
|
| 156 |
os.unlink(pkg) |
| 157 |
return result |
Archives