* [gentoo-commits] proj/layman:master commit in: layman/overlays/, layman/tests/
@ 2011-05-02 5:25 Brian Dolbec
0 siblings, 0 replies; 2+ messages in thread
From: Brian Dolbec @ 2011-05-02 5:25 UTC (permalink / raw
To: gentoo-commits
commit: 2812cf483e10b3f3a1dddc6f931192509dbbd36c
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Mon May 2 05:07:10 2011 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon May 2 05:23:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=2812cf48
fix bug 363797 python-2.5 test errors cherypicked from 1.4.x branch
---
layman/overlays/bzr.py | 4 ++--
layman/overlays/cvs.py | 4 ++--
layman/overlays/darcs.py | 4 ++--
layman/overlays/g_common.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 +-
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
index af313ef..b251559 100644
--- a/layman/overlays/bzr.py
+++ b/layman/overlays/bzr.py
@@ -62,7 +62,7 @@ class BzrOverlay(OverlaySource):
else:
args = ['get', self.src + '/', target]
return self.postsync(
- self.run_command(self.command(), *args, cmd=self.type),
+ self.run_command(self.command(), args, cmd=self.type),
cwd=target)
def sync(self, base, quiet = False):
@@ -80,7 +80,7 @@ class BzrOverlay(OverlaySource):
else:
args = ['pull', '--overwrite', self.src]
return self.postsync(
- self.run_command(self.command(), *args, cwd=target, cmd=self.type),
+ self.run_command(self.command(), args, cwd=target, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
index edf164c..c6660d0 100644
--- a/layman/overlays/cvs.py
+++ b/layman/overlays/cvs.py
@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource):
args.append(self.subpath)
return self.postsync(
- self.run_command(self.command(), *args, cwd=base,
+ self.run_command(self.command(), args, cwd=base,
env=dict(CVSROOT=self.src), cmd=self.type),
cwd=target)
@@ -105,7 +105,7 @@ class CvsOverlay(OverlaySource):
if len(cfg_opts):
args.append(cfg_opts)
return self.postsync(
- self.run_command(self.command(), *args, cwd=target, cmd=self.type),
+ self.run_command(self.command(), args, cwd=target, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
index ce1dbb7..e566f9c 100644
--- a/layman/overlays/darcs.py
+++ b/layman/overlays/darcs.py
@@ -63,7 +63,7 @@ class DarcsOverlay(OverlaySource):
self.src + '/', target]
return self.postsync(
- self.run_command(self.command(), *args, cmd=self.type),
+ self.run_command(self.command(), args, cmd=self.type),
cwd=target)
def sync(self, base, quiet = False):
@@ -81,7 +81,7 @@ class DarcsOverlay(OverlaySource):
else:
args = ['pull', '--all', self.src]
return self.postsync(
- self.run_command(self.command(), *args, cwd=target, cmd=self.type),
+ self.run_command(self.command(), args, cwd=target, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/g_common.py b/layman/overlays/g_common.py
index 85b079b..00635b3 100644
--- a/layman/overlays/g_common.py
+++ b/layman/overlays/g_common.py
@@ -66,12 +66,12 @@ class GCommonOverlay(OverlaySource):
target = path([base, self.parent.name])
args = [target, 'sync', self.driver, self.remote_uri]
- returncode = self.run_command(self.command(), *args, cwd=target)
+ returncode = self.run_command(self.command(), args, cwd=target)
if returncode:
return returncode
args = [target, 'generate-tree']
return self.postsync(
- self.run_command(self.command(), *args, cwd=target, cmd=self.type),
+ self.run_command(self.command(), args, cwd=target, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
index 3ded205..0832699 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
@@ -67,7 +67,7 @@ class GitOverlay(OverlaySource):
args.append(fix_git_source(self.src))
args.append(target)
return self.postsync(
- self.run_command(self.command(), *args, cmd=self.type),
+ self.run_command(self.command(), args, cmd=self.type),
cwd=target)
def sync(self, base, quiet = False):
@@ -86,7 +86,7 @@ class GitOverlay(OverlaySource):
args.append(cfg_opts)
return self.postsync(
- self.run_command(self.command(), *args, cwd=target, cmd=self.type),
+ self.run_command(self.command(), args, cwd=target, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
index 53d73e9..316590d 100644
--- a/layman/overlays/mercurial.py
+++ b/layman/overlays/mercurial.py
@@ -62,7 +62,7 @@ class MercurialOverlay(OverlaySource):
args = ['clone', self.src + '/', target]
return self.postsync(
- self.run_command(self.command(), *args, cmd=self.type),
+ self.run_command(self.command(), args, cmd=self.type),
cwd=target)
def sync(self, base, quiet = False):
@@ -81,7 +81,7 @@ class MercurialOverlay(OverlaySource):
args = ['pull', '-u', self.src]
return self.postsync(
- self.run_command(self.command(), *args, cwd=target, cmd=self.type),
+ self.run_command(self.command(), args, cwd=target, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py
index 8243c09..3090c77 100644
--- a/layman/overlays/rsync.py
+++ b/layman/overlays/rsync.py
@@ -77,7 +77,7 @@ class RsyncOverlay(OverlaySource):
args.append(target)
return self.postsync(
- self.run_command(self.command(), *args, cmd=self.type),
+ self.run_command(self.command(), args, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/source.py b/layman/overlays/source.py
index a845266..b833fd2 100644
--- a/layman/overlays/source.py
+++ b/layman/overlays/source.py
@@ -111,9 +111,9 @@ class OverlaySource(object):
def command(self):
return self.config['%s_command' % self.__class__.type_key]
- def run_command(self, command, *args, **kwargs):
+ def run_command(self, command, args, **kwargs):
file_to_run = _resolve_command(command, self.output.error)[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 7e27d12..c64be62 100644
--- a/layman/overlays/svn.py
+++ b/layman/overlays/svn.py
@@ -65,7 +65,7 @@ class SvnOverlay(OverlaySource):
args.append(target)
return self.postsync(
- self.run_command(self.command(),*args, cmd=self.type),
+ self.run_command(self.command(), args, cmd=self.type),
cwd=target)
def sync(self, base, quiet = False):
@@ -94,7 +94,7 @@ class SvnOverlay(OverlaySource):
args.append(target)
return self.postsync(
- self.run_command(self.command(),*args, cmd=self.type),
+ self.run_command(self.command(), args, cmd=self.type),
cwd=target)
def supported(self):
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py
index a759332..ac030d8 100644
--- a/layman/overlays/tar.py
+++ b/layman/overlays/tar.py
@@ -123,7 +123,7 @@ class TarOverlay(OverlaySource):
# tar -v -x -f SOURCE -C TARGET
args = ['-v', '-x', '-f', pkg, '-C', dest_dir]
- result = self.run_command(self.command(), *args, cmd=self.type)
+ result = self.run_command(self.command(), args, cmd=self.type)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/layman:master commit in: layman/overlays/, layman/tests/
@ 2011-07-23 6:45 Brian Dolbec
0 siblings, 0 replies; 2+ messages in thread
From: Brian Dolbec @ 2011-07-23 6:45 UTC (permalink / raw
To: gentoo-commits
commit: 1e4647627b386b83f49c5a42e0c12b43439623c4
Author: dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Fri Jul 22 02:41:48 2011 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jul 22 02:41:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=1e464762
some docstring test updates
---
layman/overlays/tar.py | 8 ++++----
layman/tests/dtest.py | 6 ++++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py
index ac030d8..e6c0d45 100644
--- a/layman/overlays/tar.py
+++ b/layman/overlays/tar.py
@@ -40,7 +40,7 @@ from layman.overlays.source import OverlaySource, require_supported
class TarOverlay(OverlaySource):
''' Handles tar overlays.
- >>> from layman.debug import OUT
+ >>> from layman.output import Message
>>> import xml.etree.ElementTree as ET # Python 2.5
>>> repo = ET.Element('repo')
>>> repo_name = ET.Element('name')
@@ -57,12 +57,12 @@ class TarOverlay(OverlaySource):
>>> subpath = ET.Element('subpath')
>>> subpath.text = 'layman-test'
>>> repo[:] = [repo_name, desc, owner, source, subpath]
- >>> config = {'tar_command':'/bin/tar'}
+ >>> config = {'tar_command':'/bin/tar', 'output': Message()}
>>> testdir = os.tmpnam()
>>> os.mkdir(testdir)
>>> from layman.overlays.overlay import Overlay
- >>> a = Overlay(repo, config, quiet=False)
- >>> OUT.color_off()
+ >>> a = Overlay(config, repo, quiet=False)
+ >>> config['output'].set_colorize(False)
>>> a.add(testdir) #doctest: +ELLIPSIS
* Running... # /bin/tar -v -x -f...
>>> sorted(os.listdir(testdir + '/dummy'))
diff --git a/layman/tests/dtest.py b/layman/tests/dtest.py
index 5edd6ce..15e0900 100755
--- a/layman/tests/dtest.py
+++ b/layman/tests/dtest.py
@@ -49,7 +49,9 @@ import unittest, doctest
# clean but no testing : CN
# unclean but no testing: UN
-import layman.action #CT
+#import layman.api #CT
+import layman.argsparser #CT
+import layman.cli #CT
import layman.config #CT
import layman.db #CT
import layman.dbbase #CT
@@ -65,7 +67,7 @@ import layman.overlays.tar #CT
def test_suite():
return unittest.TestSuite((
- doctest.DocTestSuite(layman.action),
+ #doctest.DocTestSuite(layman.api),
doctest.DocTestSuite(layman.config),
doctest.DocTestSuite(layman.db),
doctest.DocTestSuite(layman.dbbase),
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-23 6:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-02 5:25 [gentoo-commits] proj/layman:master commit in: layman/overlays/, layman/tests/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2011-07-23 6:45 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox