fix bug 363797 python-2.5 test errors cherypicked from 1.4.x branch

12 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
index 5edd6ce..5edd6ce 100644..100755
--- a/layman/tests/dtest.py
+++ b/layman/tests/dtest.py
diff --git a/layman/tests/external.py b/layman/tests/external.py
index 3c23373..3c23373 100644..100755
--- a/layman/tests/external.py
+++ b/layman/tests/external.py