1 |
idl0r 11/04/27 13:23:50 |
2 |
|
3 |
Modified: layman-1.4.2-python-compatbility-fix.patch |
4 |
Log: |
5 |
Revision bump. The "python-compatbility-fix.patch" has been extended. |
6 |
|
7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: layman-1.4.2-python-compatbility-fix.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- layman-1.4.2-python-compatbility-fix.patch 25 Apr 2011 19:43:01 -0000 1.1 |
23 |
+++ layman-1.4.2-python-compatbility-fix.patch 27 Apr 2011 13:23:50 -0000 1.2 |
24 |
@@ -1,89 +1,148 @@ |
25 |
-From a7aac809d740a7393c9fd20f701802a7786bba42 Mon Sep 17 00:00:00 2001 |
26 |
-From: Brian Dolbec <brian.dolbec@×××××.com> |
27 |
-Date: Fri, 22 Apr 2011 23:53:19 -0700 |
28 |
-Subject: [PATCH] fix bug 363797 python-2.5 test errors. |
29 |
+From 35815463599b2aa843edcc976920d996f6e4b0e2 Mon Sep 17 00:00:00 2001 |
30 |
+From: dol-sen <brian.dolbec@×××××.com> |
31 |
+Date: Wed, 27 Apr 2011 03:58:06 -0700 |
32 |
+Subject: [PATCH] fix broken *args for python 2.5 and 2.6+. |
33 |
+ Also fixes my previous fix & resultant breakage. |
34 |
+ Passes tests for all python versions supported. |
35 |
|
36 |
--- |
37 |
+ bin/layman | 2 +- |
38 |
layman/overlays/bzr.py | 2 +- |
39 |
- layman/overlays/cvs.py | 4 ++-- |
40 |
layman/overlays/darcs.py | 2 +- |
41 |
layman/overlays/git.py | 2 +- |
42 |
layman/overlays/mercurial.py | 2 +- |
43 |
- 5 files changed, 6 insertions(+), 6 deletions(-) |
44 |
+ layman/overlays/rsync.py | 2 +- |
45 |
+ layman/overlays/source.py | 4 ++-- |
46 |
+ layman/overlays/svn.py | 4 ++-- |
47 |
+ layman/overlays/tar.py | 2 +- |
48 |
+ 9 files changed, 11 insertions(+), 11 deletions(-) |
49 |
|
50 |
+diff --git a/bin/layman b/bin/layman |
51 |
+index b85f4fa..01ee0c8 100755 |
52 |
+--- a/bin/layman |
53 |
++++ b/bin/layman |
54 |
+@@ -1,4 +1,4 @@ |
55 |
+-#!python |
56 |
++#!/usr/bin/python |
57 |
+ ################################################################################ |
58 |
+ # LAYMAN - A UTILITY TO SELECT AND UPDATE GENTOO OVERLAYS |
59 |
+ ################################################################################ |
60 |
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py |
61 |
-index e73c2f4..4725c98 100644 |
62 |
+index 4725c98..b59cf6c 100644 |
63 |
--- a/layman/overlays/bzr.py |
64 |
+++ b/layman/overlays/bzr.py |
65 |
-@@ -61,7 +61,7 @@ class BzrOverlay(OverlaySource): |
66 |
+@@ -52,7 +52,7 @@ class BzrOverlay(OverlaySource): |
67 |
|
68 |
- # bzr pull --overwrite SOURCE |
69 |
- args = ['pull', '--overwrite', self.src] |
70 |
-- return self.run_command(*args, cwd=path([base, self.parent.name])) |
71 |
-+ return self.run_command(args, cwd=path([base, self.parent.name])) |
72 |
- |
73 |
- def supported(self): |
74 |
- '''Overlay type supported?''' |
75 |
-diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py |
76 |
-index f8fc277..4924ca4 100644 |
77 |
---- a/layman/overlays/cvs.py |
78 |
-+++ b/layman/overlays/cvs.py |
79 |
-@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource): |
80 |
- args.append(self.parent.name) |
81 |
- args.append(self.subpath) |
82 |
- |
83 |
-- return self.run_command(*args, cwd=base, env=dict(CVSROOT=self.src)) |
84 |
-+ return self.run_command(args, cwd=base, env=dict(CVSROOT=self.src)) |
85 |
+ # bzr get SOURCE TARGET |
86 |
+ args = ['get', self.src + '/', path([base, self.parent.name])] |
87 |
+- return self.run_command(*args) |
88 |
++ return self.run_command(args) |
89 |
|
90 |
def sync(self, base, quiet = False): |
91 |
'''Sync overlay.''' |
92 |
-@@ -96,7 +96,7 @@ class CvsOverlay(OverlaySource): |
93 |
- args.append('-q') |
94 |
- args.append('update') |
95 |
- args.append('-d') |
96 |
-- return self.run_command(*args, cwd=path([base, self.parent.name])) |
97 |
-+ return self.run_command(args, cwd=path([base, self.parent.name])) |
98 |
- |
99 |
- def supported(self): |
100 |
- '''Overlay type supported?''' |
101 |
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py |
102 |
-index 7d89477..12e75ec 100644 |
103 |
+index 12e75ec..c062543 100644 |
104 |
--- a/layman/overlays/darcs.py |
105 |
+++ b/layman/overlays/darcs.py |
106 |
-@@ -60,7 +60,7 @@ class DarcsOverlay(OverlaySource): |
107 |
+@@ -51,7 +51,7 @@ class DarcsOverlay(OverlaySource): |
108 |
|
109 |
- # darcs pull --all SOURCE |
110 |
- args = ['pull', '--all', self.src] |
111 |
-- return self.run_command(*args, cwd=path([base, self.parent.name])) |
112 |
-+ return self.run_command(args, cwd=path([base, self.parent.name])) |
113 |
+ # darcs get --partial SOURCE TARGET |
114 |
+ args = ['get', '--partial', self.src + '/', path([base, self.parent.name])] |
115 |
+- return self.run_command(*args) |
116 |
++ return self.run_command(args) |
117 |
|
118 |
- def supported(self): |
119 |
- '''Overlay type supported?''' |
120 |
+ def sync(self, base, quiet = False): |
121 |
+ '''Sync overlay.''' |
122 |
diff --git a/layman/overlays/git.py b/layman/overlays/git.py |
123 |
-index caa73f4..8db6c51 100644 |
124 |
+index 8db6c51..3b2608b 100644 |
125 |
--- a/layman/overlays/git.py |
126 |
+++ b/layman/overlays/git.py |
127 |
-@@ -70,7 +70,7 @@ class GitOverlay(OverlaySource): |
128 |
- args = ['pull'] |
129 |
- if quiet: |
130 |
+@@ -60,7 +60,7 @@ class GitOverlay(OverlaySource): |
131 |
args.append('-q') |
132 |
-- return self.run_command(*args, cwd=path([base, self.parent.name])) |
133 |
-+ return self.run_command(args, cwd=path([base, self.parent.name])) |
134 |
+ args.append(fix_git_source(self.src)) |
135 |
+ args.append(path([base, self.parent.name])) |
136 |
+- return self.run_command(*args) |
137 |
++ return self.run_command(args) |
138 |
|
139 |
- def supported(self): |
140 |
- '''Overlay type supported?''' |
141 |
+ def sync(self, base, quiet = False): |
142 |
+ '''Sync overlay.''' |
143 |
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py |
144 |
-index 06cf59d..ea3f9da 100644 |
145 |
+index ea3f9da..8bf919b 100644 |
146 |
--- a/layman/overlays/mercurial.py |
147 |
+++ b/layman/overlays/mercurial.py |
148 |
-@@ -60,7 +60,7 @@ class MercurialOverlay(OverlaySource): |
149 |
+@@ -51,7 +51,7 @@ class MercurialOverlay(OverlaySource): |
150 |
|
151 |
- # hg pull -u SOURCE |
152 |
- args = ['pull', '-u', self.src] |
153 |
-- return self.run_command(*args, cwd=path([base, self.parent.name])) |
154 |
-+ return self.run_command(args, cwd=path([base, self.parent.name])) |
155 |
+ # hg clone SOURCE TARGET |
156 |
+ args = ['clone', self.src + '/', path([base, self.parent.name])] |
157 |
+- return self.run_command(*args) |
158 |
++ return self.run_command(args) |
159 |
+ |
160 |
+ def sync(self, base, quiet = False): |
161 |
+ '''Sync overlay.''' |
162 |
+diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py |
163 |
+index 3a5a342..bf01462 100644 |
164 |
+--- a/layman/overlays/rsync.py |
165 |
++++ b/layman/overlays/rsync.py |
166 |
+@@ -66,7 +66,7 @@ class RsyncOverlay(OverlaySource): |
167 |
+ args.append(self.src + '/') |
168 |
+ args.append(path([base, self.parent.name])) |
169 |
+ |
170 |
+- return self.run_command(*args) |
171 |
++ return self.run_command(args) |
172 |
|
173 |
def supported(self): |
174 |
'''Overlay type supported?''' |
175 |
+diff --git a/layman/overlays/source.py b/layman/overlays/source.py |
176 |
+index 2c039c9..9e7f974 100644 |
177 |
+--- a/layman/overlays/source.py |
178 |
++++ b/layman/overlays/source.py |
179 |
+@@ -107,9 +107,9 @@ class OverlaySource(object): |
180 |
+ def command(self): |
181 |
+ return self.config['%s_command' % self.__class__.type_key] |
182 |
+ |
183 |
+- def run_command(self, *args, **kwargs): |
184 |
++ def run_command(self, args, **kwargs): |
185 |
+ file_to_run = _resolve_command(self.command())[1] |
186 |
+- args = (file_to_run, ) + args |
187 |
++ args = [file_to_run] + args |
188 |
+ assert('pwd' not in kwargs) # Bug detector |
189 |
+ |
190 |
+ cwd = kwargs.get('cwd', None) |
191 |
+diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py |
192 |
+index 2a30198..092d786 100644 |
193 |
+--- a/layman/overlays/svn.py |
194 |
++++ b/layman/overlays/svn.py |
195 |
+@@ -56,7 +56,7 @@ class SvnOverlay(OverlaySource): |
196 |
+ args.append(self.src + '/@') |
197 |
+ args.append(path([base, self.parent.name])) |
198 |
+ |
199 |
+- return self.run_command(*args) |
200 |
++ return self.run_command(args) |
201 |
+ |
202 |
+ def sync(self, base, quiet = False): |
203 |
+ '''Sync overlay.''' |
204 |
+@@ -77,7 +77,7 @@ class SvnOverlay(OverlaySource): |
205 |
+ args.append('-q') |
206 |
+ args.append(checkout_location()) |
207 |
+ |
208 |
+- return self.run_command(*args) |
209 |
++ return self.run_command(args) |
210 |
+ |
211 |
+ def supported(self): |
212 |
+ '''Overlay type supported?''' |
213 |
+diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py |
214 |
+index 919f4df..612b6b6 100644 |
215 |
+--- a/layman/overlays/tar.py |
216 |
++++ b/layman/overlays/tar.py |
217 |
+@@ -128,7 +128,7 @@ class TarOverlay(OverlaySource): |
218 |
+ |
219 |
+ # tar -v -x -f SOURCE -C TARGET |
220 |
+ args = ['-v', '-x', '-f', pkg, '-C', dest_dir] |
221 |
+- result = self.run_command(*args) |
222 |
++ result = self.run_command(args) |
223 |
+ |
224 |
+ os.unlink(pkg) |
225 |
+ return result |
226 |
-- |
227 |
1.7.3.4 |
228 |
+ |