diff options
author | Brian Dolbec <dolsen@gentoo.org> | 2015-02-05 09:20:32 -0800 |
---|---|---|
committer | Brian Dolbec <dolsen@gentoo.org> | 2015-02-07 12:48:37 -0800 |
commit | d3b710bbda6f523b1b1867bc4287e6ad52998389 (patch) | |
tree | 1efb74f4ef59546b344411ad59d5349c13c6d92a | |
parent | laymanator.py: Corrects misspelling of "baby" in sync plugin output (diff) | |
download | layman-d3b710bbda6f523b1b1867bc4287e6ad52998389.tar.gz layman-d3b710bbda6f523b1b1867bc4287e6ad52998389.tar.bz2 layman-d3b710bbda6f523b1b1867bc4287e6ad52998389.zip |
Split options for proper args passing
-rw-r--r-- | etc/layman.cfg | 1 | ||||
-rw-r--r-- | layman/overlays/modules/bzr/bzr.py | 5 | ||||
-rw-r--r-- | layman/overlays/modules/cvs/cvs.py | 4 | ||||
-rw-r--r-- | layman/overlays/modules/darcs/darcs.py | 5 | ||||
-rw-r--r-- | layman/overlays/modules/git/git.py | 4 | ||||
-rw-r--r-- | layman/overlays/modules/mercurial/mercurial.py | 4 | ||||
-rw-r--r-- | layman/overlays/modules/rsync/rsync.py | 2 | ||||
-rw-r--r-- | layman/overlays/modules/svn/svn.py | 4 |
8 files changed, 14 insertions, 15 deletions
diff --git a/etc/layman.cfg b/etc/layman.cfg index 7bf291e..2a8eabf 100644 --- a/etc/layman.cfg +++ b/etc/layman.cfg @@ -211,6 +211,7 @@ news_reporter: portage # # These commnad options will be added to the above commands # when the overlay is added or synced. +# Use spaces to seperate command line arguments # # note: there are some options hardcoded in the backend # scripts already. All VCS types listed here are diff --git a/layman/overlays/modules/bzr/bzr.py b/layman/overlays/modules/bzr/bzr.py index 614f816..03b0730 100644 --- a/layman/overlays/modules/bzr/bzr.py +++ b/layman/overlays/modules/bzr/bzr.py @@ -72,8 +72,7 @@ class BzrOverlay(OverlaySource): # bzr get SOURCE TARGET if len(cfg_opts): - args = ['branch', cfg_opts, - src, target] + args = ['branch'] + cfg_opts.split() + [src, target] else: args = ['branch', src, target] return self.postsync( @@ -112,7 +111,7 @@ class BzrOverlay(OverlaySource): # bzr pull --overwrite SOURCE if len(cfg_opts): - args = ['pull', cfg_opts, '--overwrite', self.src] + args = ['pull'] + cfg_opts.split() + ['--overwrite', self.src] else: args = ['pull', '--overwrite', self.src] return self.postsync( diff --git a/layman/overlays/modules/cvs/cvs.py b/layman/overlays/modules/cvs/cvs.py index 62ad156..3dc6469 100644 --- a/layman/overlays/modules/cvs/cvs.py +++ b/layman/overlays/modules/cvs/cvs.py @@ -66,7 +66,7 @@ class CvsOverlay(OverlaySource): args.append('co') args.append('-d') if len(cfg_opts): - args.append(cfg_opts) + args.extend(cfg_opts.split()) args.append(self.parent.name) args.append(self.branch) @@ -129,7 +129,7 @@ class CvsOverlay(OverlaySource): args.append('update') args.append('-d') if len(cfg_opts): - args.append(cfg_opts) + args.extend(cfg_opts.split()) return self.postsync( run_command(self.config, self.command(), args, cwd=target, cmd=self.type), diff --git a/layman/overlays/modules/darcs/darcs.py b/layman/overlays/modules/darcs/darcs.py index 9e951da..1960f8f 100644 --- a/layman/overlays/modules/darcs/darcs.py +++ b/layman/overlays/modules/darcs/darcs.py @@ -64,8 +64,7 @@ class DarcsOverlay(OverlaySource): # darcs get --partial SOURCE TARGET if len(cfg_opts): - args = ['get', '--partial', cfg_opts, - src, target] + args = ['get', '--partial'] + cfg_opts.split() + [src, target] else: args = ['get', '--partial', src, target] @@ -85,7 +84,7 @@ class DarcsOverlay(OverlaySource): # darcs pull --all SOURCE if len(cfg_opts): - args = ['pull', '--all', cfg_opts, self.src] + args = ['pull', '--all'] + cfg_opts.split() + [self.src] else: args = ['pull', '--all', self.src] return self.postsync( diff --git a/layman/overlays/modules/git/git.py b/layman/overlays/modules/git/git.py index f647139..228c2af 100644 --- a/layman/overlays/modules/git/git.py +++ b/layman/overlays/modules/git/git.py @@ -75,7 +75,7 @@ class GitOverlay(OverlaySource): if self.config['quiet']: args.append('-q') if len(cfg_opts): - args.append(cfg_opts) + args.extend(cfg_opts.split()) args.append(self._fix_git_source(self.src)) args.append(target) @@ -137,7 +137,7 @@ class GitOverlay(OverlaySource): if self.config['quiet']: args.append('-q') if len(cfg_opts): - args.append(cfg_opts) + args.extend(cfg_opts.split()) return self.postsync( run_command(self.config, self.command(), args, cwd=target, diff --git a/layman/overlays/modules/mercurial/mercurial.py b/layman/overlays/modules/mercurial/mercurial.py index fa32555..0b5e7e5 100644 --- a/layman/overlays/modules/mercurial/mercurial.py +++ b/layman/overlays/modules/mercurial/mercurial.py @@ -76,7 +76,7 @@ class MercurialOverlay(OverlaySource): # hg clone SOURCE TARGET if len(cfg_opts): - args = ['clone', cfg_opts, src, target] + args = ['clone'] + cfg_opts.split() + [src, target] else: args = ['clone', src, target] @@ -123,7 +123,7 @@ class MercurialOverlay(OverlaySource): # hg pull -u SOURCE if len(cfg_opts): - args = ['pull', '-u', cfg_opts, self.src] + args = ['pull', '-u'] + cfg_opts.split() + [self.src] else: args = ['pull', '-u', self.src] diff --git a/layman/overlays/modules/rsync/rsync.py b/layman/overlays/modules/rsync/rsync.py index f540b76..e6a6308 100644 --- a/layman/overlays/modules/rsync/rsync.py +++ b/layman/overlays/modules/rsync/rsync.py @@ -75,7 +75,7 @@ class RsyncOverlay(OverlaySource): if self.config['quiet']: args.append('-q') if len(cfg_opts): - args.append(cfg_opts) + args.extend(cfg_opts.split()) args.append(self.src + '/') args.append(target) diff --git a/layman/overlays/modules/svn/svn.py b/layman/overlays/modules/svn/svn.py index 586a9dc..fff8805 100644 --- a/layman/overlays/modules/svn/svn.py +++ b/layman/overlays/modules/svn/svn.py @@ -80,7 +80,7 @@ class SvnOverlay(OverlaySource): if self.config['quiet']: args.append('-q') if len(cfg_opts): - args.append(cfg_opts) + args.extend(cfg_opts.split()) src = self._fix_svn_source(self.src) args.append(src) @@ -135,7 +135,7 @@ class SvnOverlay(OverlaySource): if self.config['quiet']: args.append('-q') if len(cfg_opts): - args.append(cfg_opts) + args.extend(cfg_opts.split()) args.append(self.target) return self.postsync( |