* [gentoo-commits] gentoo-x86 commit in app-portage/layman/files: layman-1.4.2-python-compatbility-fix.patch
@ 2011-04-28 3:25 Jeremy Olexa (darkside)
0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-04-28 3:25 UTC (permalink / raw
To: gentoo-commits
darkside 11/04/28 03:25:03
Modified: layman-1.4.2-python-compatbility-fix.patch
Log:
Revision bump to fix broken sync function, bug 365123. New patch by Brian Dolbec
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Revision Changes Path
1.3 app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?r1=1.2&r2=1.3
Index: layman-1.4.2-python-compatbility-fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- layman-1.4.2-python-compatbility-fix.patch 27 Apr 2011 13:23:50 -0000 1.2
+++ layman-1.4.2-python-compatbility-fix.patch 28 Apr 2011 03:25:03 -0000 1.3
@@ -1,21 +1,24 @@
-From 35815463599b2aa843edcc976920d996f6e4b0e2 Mon Sep 17 00:00:00 2001
-From: dol-sen <brian.dolbec@gmail.com>
-Date: Wed, 27 Apr 2011 03:58:06 -0700
-Subject: [PATCH] fix broken *args for python 2.5 and 2.6+.
- Also fixes my previous fix & resultant breakage.
+From edce984f2c034254af33fd6fe18bc1e2689581bf Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <brian.dolbec@gmail.com>
+Date: Fri, 22 Apr 2011 23:53:19 -0700
+Subject: [PATCH] fix bug 363797 python-2.5 test errors.
+ fixes broken *args for python 2.5 and 2.6+.
Passes tests for all python versions supported.
---
bin/layman | 2 +-
- layman/overlays/bzr.py | 2 +-
- layman/overlays/darcs.py | 2 +-
- layman/overlays/git.py | 2 +-
- layman/overlays/mercurial.py | 2 +-
+ layman/overlays/bzr.py | 4 ++--
+ layman/overlays/cvs.py | 4 ++--
+ layman/overlays/darcs.py | 4 ++--
+ layman/overlays/git.py | 4 ++--
+ layman/overlays/mercurial.py | 4 ++--
layman/overlays/rsync.py | 2 +-
layman/overlays/source.py | 4 ++--
layman/overlays/svn.py | 4 ++--
layman/overlays/tar.py | 2 +-
- 9 files changed, 11 insertions(+), 11 deletions(-)
+ 10 files changed, 17 insertions(+), 17 deletions(-)
+ mode change 100644 => 100755 layman/tests/dtest.py
+ mode change 100644 => 100755 layman/tests/external.py
diff --git a/bin/layman b/bin/layman
index b85f4fa..01ee0c8 100755
@@ -28,7 +31,7 @@
# LAYMAN - A UTILITY TO SELECT AND UPDATE GENTOO OVERLAYS
################################################################################
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
-index 4725c98..b59cf6c 100644
+index e73c2f4..b59cf6c 100644
--- a/layman/overlays/bzr.py
+++ b/layman/overlays/bzr.py
@@ -52,7 +52,7 @@ class BzrOverlay(OverlaySource):
@@ -40,8 +43,39 @@
def sync(self, base, quiet = False):
'''Sync overlay.'''
+@@ -61,7 +61,7 @@ class BzrOverlay(OverlaySource):
+
+ # bzr pull --overwrite SOURCE
+ args = ['pull', '--overwrite', self.src]
+- return self.run_command(*args, cwd=path([base, self.parent.name]))
++ return self.run_command(args, cwd=path([base, self.parent.name]))
+
+ def supported(self):
+ '''Overlay type supported?'''
+diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
+index f8fc277..4924ca4 100644
+--- a/layman/overlays/cvs.py
++++ b/layman/overlays/cvs.py
+@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource):
+ args.append(self.parent.name)
+ args.append(self.subpath)
+
+- return self.run_command(*args, cwd=base, env=dict(CVSROOT=self.src))
++ return self.run_command(args, cwd=base, env=dict(CVSROOT=self.src))
+
+ def sync(self, base, quiet = False):
+ '''Sync overlay.'''
+@@ -96,7 +96,7 @@ class CvsOverlay(OverlaySource):
+ args.append('-q')
+ args.append('update')
+ args.append('-d')
+- return self.run_command(*args, cwd=path([base, self.parent.name]))
++ return self.run_command(args, cwd=path([base, self.parent.name]))
+
+ def supported(self):
+ '''Overlay type supported?'''
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
-index 12e75ec..c062543 100644
+index 7d89477..c062543 100644
--- a/layman/overlays/darcs.py
+++ b/layman/overlays/darcs.py
@@ -51,7 +51,7 @@ class DarcsOverlay(OverlaySource):
@@ -53,8 +87,17 @@
def sync(self, base, quiet = False):
'''Sync overlay.'''
+@@ -60,7 +60,7 @@ class DarcsOverlay(OverlaySource):
+
+ # darcs pull --all SOURCE
+ args = ['pull', '--all', self.src]
+- return self.run_command(*args, cwd=path([base, self.parent.name]))
++ return self.run_command(args, cwd=path([base, self.parent.name]))
+
+ def supported(self):
+ '''Overlay type supported?'''
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
-index 8db6c51..3b2608b 100644
+index caa73f4..3b2608b 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
@@ -60,7 +60,7 @@ class GitOverlay(OverlaySource):
@@ -66,8 +109,17 @@
def sync(self, base, quiet = False):
'''Sync overlay.'''
+@@ -70,7 +70,7 @@ class GitOverlay(OverlaySource):
+ args = ['pull']
+ if quiet:
+ args.append('-q')
+- return self.run_command(*args, cwd=path([base, self.parent.name]))
++ return self.run_command(args, cwd=path([base, self.parent.name]))
+
+ def supported(self):
+ '''Overlay type supported?'''
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
-index ea3f9da..8bf919b 100644
+index 06cf59d..8bf919b 100644
--- a/layman/overlays/mercurial.py
+++ b/layman/overlays/mercurial.py
@@ -51,7 +51,7 @@ class MercurialOverlay(OverlaySource):
@@ -79,6 +131,15 @@
def sync(self, base, quiet = False):
'''Sync overlay.'''
+@@ -60,7 +60,7 @@ class MercurialOverlay(OverlaySource):
+
+ # hg pull -u SOURCE
+ args = ['pull', '-u', self.src]
+- return self.run_command(*args, cwd=path([base, self.parent.name]))
++ return self.run_command(args, cwd=path([base, self.parent.name]))
+
+ def supported(self):
+ '''Overlay type supported?'''
diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py
index 3a5a342..bf01462 100644
--- a/layman/overlays/rsync.py
@@ -143,6 +204,12 @@
os.unlink(pkg)
return result
+diff --git a/layman/tests/dtest.py b/layman/tests/dtest.py
+old mode 100644
+new mode 100755
+diff --git a/layman/tests/external.py b/layman/tests/external.py
+old mode 100644
+new mode 100755
--
-1.7.3.4
+1.7.4.1
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-portage/layman/files: layman-1.4.2-python-compatbility-fix.patch
@ 2011-04-27 13:23 Christian Ruppert (idl0r)
0 siblings, 0 replies; 3+ messages in thread
From: Christian Ruppert (idl0r) @ 2011-04-27 13:23 UTC (permalink / raw
To: gentoo-commits
idl0r 11/04/27 13:23:50
Modified: layman-1.4.2-python-compatbility-fix.patch
Log:
Revision bump. The "python-compatbility-fix.patch" has been extended.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.2 app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
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
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
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
Index: layman-1.4.2-python-compatbility-fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- layman-1.4.2-python-compatbility-fix.patch 25 Apr 2011 19:43:01 -0000 1.1
+++ layman-1.4.2-python-compatbility-fix.patch 27 Apr 2011 13:23:50 -0000 1.2
@@ -1,89 +1,148 @@
-From a7aac809d740a7393c9fd20f701802a7786bba42 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <brian.dolbec@gmail.com>
-Date: Fri, 22 Apr 2011 23:53:19 -0700
-Subject: [PATCH] fix bug 363797 python-2.5 test errors.
+From 35815463599b2aa843edcc976920d996f6e4b0e2 Mon Sep 17 00:00:00 2001
+From: dol-sen <brian.dolbec@gmail.com>
+Date: Wed, 27 Apr 2011 03:58:06 -0700
+Subject: [PATCH] fix broken *args for python 2.5 and 2.6+.
+ Also fixes my previous fix & resultant breakage.
+ Passes tests for all python versions supported.
---
+ bin/layman | 2 +-
layman/overlays/bzr.py | 2 +-
- layman/overlays/cvs.py | 4 ++--
layman/overlays/darcs.py | 2 +-
layman/overlays/git.py | 2 +-
layman/overlays/mercurial.py | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
+ layman/overlays/rsync.py | 2 +-
+ layman/overlays/source.py | 4 ++--
+ layman/overlays/svn.py | 4 ++--
+ layman/overlays/tar.py | 2 +-
+ 9 files changed, 11 insertions(+), 11 deletions(-)
+diff --git a/bin/layman b/bin/layman
+index b85f4fa..01ee0c8 100755
+--- a/bin/layman
++++ b/bin/layman
+@@ -1,4 +1,4 @@
+-#!python
++#!/usr/bin/python
+ ################################################################################
+ # LAYMAN - A UTILITY TO SELECT AND UPDATE GENTOO OVERLAYS
+ ################################################################################
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
-index e73c2f4..4725c98 100644
+index 4725c98..b59cf6c 100644
--- a/layman/overlays/bzr.py
+++ b/layman/overlays/bzr.py
-@@ -61,7 +61,7 @@ class BzrOverlay(OverlaySource):
+@@ -52,7 +52,7 @@ class BzrOverlay(OverlaySource):
- # bzr pull --overwrite SOURCE
- args = ['pull', '--overwrite', self.src]
-- return self.run_command(*args, cwd=path([base, self.parent.name]))
-+ return self.run_command(args, cwd=path([base, self.parent.name]))
-
- def supported(self):
- '''Overlay type supported?'''
-diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
-index f8fc277..4924ca4 100644
---- a/layman/overlays/cvs.py
-+++ b/layman/overlays/cvs.py
-@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource):
- args.append(self.parent.name)
- args.append(self.subpath)
-
-- return self.run_command(*args, cwd=base, env=dict(CVSROOT=self.src))
-+ return self.run_command(args, cwd=base, env=dict(CVSROOT=self.src))
+ # bzr get SOURCE TARGET
+ args = ['get', self.src + '/', path([base, self.parent.name])]
+- return self.run_command(*args)
++ return self.run_command(args)
def sync(self, base, quiet = False):
'''Sync overlay.'''
-@@ -96,7 +96,7 @@ class CvsOverlay(OverlaySource):
- args.append('-q')
- args.append('update')
- args.append('-d')
-- return self.run_command(*args, cwd=path([base, self.parent.name]))
-+ return self.run_command(args, cwd=path([base, self.parent.name]))
-
- def supported(self):
- '''Overlay type supported?'''
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
-index 7d89477..12e75ec 100644
+index 12e75ec..c062543 100644
--- a/layman/overlays/darcs.py
+++ b/layman/overlays/darcs.py
-@@ -60,7 +60,7 @@ class DarcsOverlay(OverlaySource):
+@@ -51,7 +51,7 @@ class DarcsOverlay(OverlaySource):
- # darcs pull --all SOURCE
- args = ['pull', '--all', self.src]
-- return self.run_command(*args, cwd=path([base, self.parent.name]))
-+ return self.run_command(args, cwd=path([base, self.parent.name]))
+ # darcs get --partial SOURCE TARGET
+ args = ['get', '--partial', self.src + '/', path([base, self.parent.name])]
+- return self.run_command(*args)
++ return self.run_command(args)
- def supported(self):
- '''Overlay type supported?'''
+ def sync(self, base, quiet = False):
+ '''Sync overlay.'''
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
-index caa73f4..8db6c51 100644
+index 8db6c51..3b2608b 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
-@@ -70,7 +70,7 @@ class GitOverlay(OverlaySource):
- args = ['pull']
- if quiet:
+@@ -60,7 +60,7 @@ class GitOverlay(OverlaySource):
args.append('-q')
-- return self.run_command(*args, cwd=path([base, self.parent.name]))
-+ return self.run_command(args, cwd=path([base, self.parent.name]))
+ args.append(fix_git_source(self.src))
+ args.append(path([base, self.parent.name]))
+- return self.run_command(*args)
++ return self.run_command(args)
- def supported(self):
- '''Overlay type supported?'''
+ def sync(self, base, quiet = False):
+ '''Sync overlay.'''
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
-index 06cf59d..ea3f9da 100644
+index ea3f9da..8bf919b 100644
--- a/layman/overlays/mercurial.py
+++ b/layman/overlays/mercurial.py
-@@ -60,7 +60,7 @@ class MercurialOverlay(OverlaySource):
+@@ -51,7 +51,7 @@ class MercurialOverlay(OverlaySource):
- # hg pull -u SOURCE
- args = ['pull', '-u', self.src]
-- return self.run_command(*args, cwd=path([base, self.parent.name]))
-+ return self.run_command(args, cwd=path([base, self.parent.name]))
+ # hg clone SOURCE TARGET
+ args = ['clone', self.src + '/', path([base, self.parent.name])]
+- return self.run_command(*args)
++ return self.run_command(args)
+
+ def sync(self, base, quiet = False):
+ '''Sync overlay.'''
+diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py
+index 3a5a342..bf01462 100644
+--- a/layman/overlays/rsync.py
++++ b/layman/overlays/rsync.py
+@@ -66,7 +66,7 @@ class RsyncOverlay(OverlaySource):
+ args.append(self.src + '/')
+ args.append(path([base, self.parent.name]))
+
+- return self.run_command(*args)
++ return self.run_command(args)
def supported(self):
'''Overlay type supported?'''
+diff --git a/layman/overlays/source.py b/layman/overlays/source.py
+index 2c039c9..9e7f974 100644
+--- a/layman/overlays/source.py
++++ b/layman/overlays/source.py
+@@ -107,9 +107,9 @@ class OverlaySource(object):
+ def command(self):
+ return self.config['%s_command' % self.__class__.type_key]
+
+- def run_command(self, *args, **kwargs):
++ def run_command(self, args, **kwargs):
+ file_to_run = _resolve_command(self.command())[1]
+- args = (file_to_run, ) + args
++ args = [file_to_run] + args
+ assert('pwd' not in kwargs) # Bug detector
+
+ cwd = kwargs.get('cwd', None)
+diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
+index 2a30198..092d786 100644
+--- a/layman/overlays/svn.py
++++ b/layman/overlays/svn.py
+@@ -56,7 +56,7 @@ class SvnOverlay(OverlaySource):
+ args.append(self.src + '/@')
+ args.append(path([base, self.parent.name]))
+
+- return self.run_command(*args)
++ return self.run_command(args)
+
+ def sync(self, base, quiet = False):
+ '''Sync overlay.'''
+@@ -77,7 +77,7 @@ class SvnOverlay(OverlaySource):
+ args.append('-q')
+ args.append(checkout_location())
+
+- return self.run_command(*args)
++ return self.run_command(args)
+
+ def supported(self):
+ '''Overlay type supported?'''
+diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py
+index 919f4df..612b6b6 100644
+--- a/layman/overlays/tar.py
++++ b/layman/overlays/tar.py
+@@ -128,7 +128,7 @@ class TarOverlay(OverlaySource):
+
+ # tar -v -x -f SOURCE -C TARGET
+ args = ['-v', '-x', '-f', pkg, '-C', dest_dir]
+- result = self.run_command(*args)
++ result = self.run_command(args)
+
+ os.unlink(pkg)
+ return result
--
1.7.3.4
+
^ permalink raw reply [flat|nested] 3+ messages in thread* [gentoo-commits] gentoo-x86 commit in app-portage/layman/files: layman-1.4.2-python-compatbility-fix.patch
@ 2011-04-25 19:43 Christian Ruppert (idl0r)
0 siblings, 0 replies; 3+ messages in thread
From: Christian Ruppert (idl0r) @ 2011-04-25 19:43 UTC (permalink / raw
To: gentoo-commits
idl0r 11/04/25 19:43:01
Added: layman-1.4.2-python-compatbility-fix.patch
Log:
Add a patch to fix backward compatibility for python <2.6, bug 363797.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.1 app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch?rev=1.1&content-type=text/plain
Index: layman-1.4.2-python-compatbility-fix.patch
===================================================================
From a7aac809d740a7393c9fd20f701802a7786bba42 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <brian.dolbec@gmail.com>
Date: Fri, 22 Apr 2011 23:53:19 -0700
Subject: [PATCH] fix bug 363797 python-2.5 test errors.
---
layman/overlays/bzr.py | 2 +-
layman/overlays/cvs.py | 4 ++--
layman/overlays/darcs.py | 2 +-
layman/overlays/git.py | 2 +-
layman/overlays/mercurial.py | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
index e73c2f4..4725c98 100644
--- a/layman/overlays/bzr.py
+++ b/layman/overlays/bzr.py
@@ -61,7 +61,7 @@ class BzrOverlay(OverlaySource):
# bzr pull --overwrite SOURCE
args = ['pull', '--overwrite', self.src]
- return self.run_command(*args, cwd=path([base, self.parent.name]))
+ return self.run_command(args, cwd=path([base, self.parent.name]))
def supported(self):
'''Overlay type supported?'''
diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
index f8fc277..4924ca4 100644
--- a/layman/overlays/cvs.py
+++ b/layman/overlays/cvs.py
@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource):
args.append(self.parent.name)
args.append(self.subpath)
- return self.run_command(*args, cwd=base, env=dict(CVSROOT=self.src))
+ return self.run_command(args, cwd=base, env=dict(CVSROOT=self.src))
def sync(self, base, quiet = False):
'''Sync overlay.'''
@@ -96,7 +96,7 @@ class CvsOverlay(OverlaySource):
args.append('-q')
args.append('update')
args.append('-d')
- return self.run_command(*args, cwd=path([base, self.parent.name]))
+ return self.run_command(args, cwd=path([base, self.parent.name]))
def supported(self):
'''Overlay type supported?'''
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
index 7d89477..12e75ec 100644
--- a/layman/overlays/darcs.py
+++ b/layman/overlays/darcs.py
@@ -60,7 +60,7 @@ class DarcsOverlay(OverlaySource):
# darcs pull --all SOURCE
args = ['pull', '--all', self.src]
- return self.run_command(*args, cwd=path([base, self.parent.name]))
+ return self.run_command(args, cwd=path([base, self.parent.name]))
def supported(self):
'''Overlay type supported?'''
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
index caa73f4..8db6c51 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
@@ -70,7 +70,7 @@ class GitOverlay(OverlaySource):
args = ['pull']
if quiet:
args.append('-q')
- return self.run_command(*args, cwd=path([base, self.parent.name]))
+ return self.run_command(args, cwd=path([base, self.parent.name]))
def supported(self):
'''Overlay type supported?'''
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
index 06cf59d..ea3f9da 100644
--- a/layman/overlays/mercurial.py
+++ b/layman/overlays/mercurial.py
@@ -60,7 +60,7 @@ class MercurialOverlay(OverlaySource):
# hg pull -u SOURCE
args = ['pull', '-u', self.src]
- return self.run_command(*args, cwd=path([base, self.parent.name]))
+ return self.run_command(args, cwd=path([base, self.parent.name]))
def supported(self):
'''Overlay type supported?'''
--
1.7.3.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-28 3:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-28 3:25 [gentoo-commits] gentoo-x86 commit in app-portage/layman/files: layman-1.4.2-python-compatbility-fix.patch Jeremy Olexa (darkside)
-- strict thread matches above, loose matches on Subject: below --
2011-04-27 13:23 Christian Ruppert (idl0r)
2011-04-25 19:43 Christian Ruppert (idl0r)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox