| 1 |
commit: d3b710bbda6f523b1b1867bc4287e6ad52998389 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 5 17:20:32 2015 +0000 |
| 4 |
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 7 20:48:37 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=d3b710bb |
| 7 |
|
| 8 |
Split options for proper args passing |
| 9 |
|
| 10 |
--- |
| 11 |
etc/layman.cfg | 1 + |
| 12 |
layman/overlays/modules/bzr/bzr.py | 5 ++--- |
| 13 |
layman/overlays/modules/cvs/cvs.py | 4 ++-- |
| 14 |
layman/overlays/modules/darcs/darcs.py | 5 ++--- |
| 15 |
layman/overlays/modules/git/git.py | 4 ++-- |
| 16 |
layman/overlays/modules/mercurial/mercurial.py | 4 ++-- |
| 17 |
layman/overlays/modules/rsync/rsync.py | 2 +- |
| 18 |
layman/overlays/modules/svn/svn.py | 4 ++-- |
| 19 |
8 files changed, 14 insertions(+), 15 deletions(-) |
| 20 |
|
| 21 |
diff --git a/etc/layman.cfg b/etc/layman.cfg |
| 22 |
index 7bf291e..2a8eabf 100644 |
| 23 |
--- a/etc/layman.cfg |
| 24 |
+++ b/etc/layman.cfg |
| 25 |
@@ -211,6 +211,7 @@ news_reporter: portage |
| 26 |
# |
| 27 |
# These commnad options will be added to the above commands |
| 28 |
# when the overlay is added or synced. |
| 29 |
+# Use spaces to seperate command line arguments |
| 30 |
# |
| 31 |
# note: there are some options hardcoded in the backend |
| 32 |
# scripts already. All VCS types listed here are |
| 33 |
|
| 34 |
diff --git a/layman/overlays/modules/bzr/bzr.py b/layman/overlays/modules/bzr/bzr.py |
| 35 |
index 614f816..03b0730 100644 |
| 36 |
--- a/layman/overlays/modules/bzr/bzr.py |
| 37 |
+++ b/layman/overlays/modules/bzr/bzr.py |
| 38 |
@@ -72,8 +72,7 @@ class BzrOverlay(OverlaySource): |
| 39 |
|
| 40 |
# bzr get SOURCE TARGET |
| 41 |
if len(cfg_opts): |
| 42 |
- args = ['branch', cfg_opts, |
| 43 |
- src, target] |
| 44 |
+ args = ['branch'] + cfg_opts.split() + [src, target] |
| 45 |
else: |
| 46 |
args = ['branch', src, target] |
| 47 |
return self.postsync( |
| 48 |
@@ -112,7 +111,7 @@ class BzrOverlay(OverlaySource): |
| 49 |
|
| 50 |
# bzr pull --overwrite SOURCE |
| 51 |
if len(cfg_opts): |
| 52 |
- args = ['pull', cfg_opts, '--overwrite', self.src] |
| 53 |
+ args = ['pull'] + cfg_opts.split() + ['--overwrite', self.src] |
| 54 |
else: |
| 55 |
args = ['pull', '--overwrite', self.src] |
| 56 |
return self.postsync( |
| 57 |
|
| 58 |
diff --git a/layman/overlays/modules/cvs/cvs.py b/layman/overlays/modules/cvs/cvs.py |
| 59 |
index 62ad156..3dc6469 100644 |
| 60 |
--- a/layman/overlays/modules/cvs/cvs.py |
| 61 |
+++ b/layman/overlays/modules/cvs/cvs.py |
| 62 |
@@ -66,7 +66,7 @@ class CvsOverlay(OverlaySource): |
| 63 |
args.append('co') |
| 64 |
args.append('-d') |
| 65 |
if len(cfg_opts): |
| 66 |
- args.append(cfg_opts) |
| 67 |
+ args.extend(cfg_opts.split()) |
| 68 |
args.append(self.parent.name) |
| 69 |
args.append(self.branch) |
| 70 |
|
| 71 |
@@ -129,7 +129,7 @@ class CvsOverlay(OverlaySource): |
| 72 |
args.append('update') |
| 73 |
args.append('-d') |
| 74 |
if len(cfg_opts): |
| 75 |
- args.append(cfg_opts) |
| 76 |
+ args.extend(cfg_opts.split()) |
| 77 |
return self.postsync( |
| 78 |
run_command(self.config, self.command(), args, cwd=target, |
| 79 |
cmd=self.type), |
| 80 |
|
| 81 |
diff --git a/layman/overlays/modules/darcs/darcs.py b/layman/overlays/modules/darcs/darcs.py |
| 82 |
index 9e951da..1960f8f 100644 |
| 83 |
--- a/layman/overlays/modules/darcs/darcs.py |
| 84 |
+++ b/layman/overlays/modules/darcs/darcs.py |
| 85 |
@@ -64,8 +64,7 @@ class DarcsOverlay(OverlaySource): |
| 86 |
|
| 87 |
# darcs get --partial SOURCE TARGET |
| 88 |
if len(cfg_opts): |
| 89 |
- args = ['get', '--partial', cfg_opts, |
| 90 |
- src, target] |
| 91 |
+ args = ['get', '--partial'] + cfg_opts.split() + [src, target] |
| 92 |
else: |
| 93 |
args = ['get', '--partial', |
| 94 |
src, target] |
| 95 |
@@ -85,7 +84,7 @@ class DarcsOverlay(OverlaySource): |
| 96 |
|
| 97 |
# darcs pull --all SOURCE |
| 98 |
if len(cfg_opts): |
| 99 |
- args = ['pull', '--all', cfg_opts, self.src] |
| 100 |
+ args = ['pull', '--all'] + cfg_opts.split() + [self.src] |
| 101 |
else: |
| 102 |
args = ['pull', '--all', self.src] |
| 103 |
return self.postsync( |
| 104 |
|
| 105 |
diff --git a/layman/overlays/modules/git/git.py b/layman/overlays/modules/git/git.py |
| 106 |
index f647139..228c2af 100644 |
| 107 |
--- a/layman/overlays/modules/git/git.py |
| 108 |
+++ b/layman/overlays/modules/git/git.py |
| 109 |
@@ -75,7 +75,7 @@ class GitOverlay(OverlaySource): |
| 110 |
if self.config['quiet']: |
| 111 |
args.append('-q') |
| 112 |
if len(cfg_opts): |
| 113 |
- args.append(cfg_opts) |
| 114 |
+ args.extend(cfg_opts.split()) |
| 115 |
args.append(self._fix_git_source(self.src)) |
| 116 |
args.append(target) |
| 117 |
|
| 118 |
@@ -137,7 +137,7 @@ class GitOverlay(OverlaySource): |
| 119 |
if self.config['quiet']: |
| 120 |
args.append('-q') |
| 121 |
if len(cfg_opts): |
| 122 |
- args.append(cfg_opts) |
| 123 |
+ args.extend(cfg_opts.split()) |
| 124 |
|
| 125 |
return self.postsync( |
| 126 |
run_command(self.config, self.command(), args, cwd=target, |
| 127 |
|
| 128 |
diff --git a/layman/overlays/modules/mercurial/mercurial.py b/layman/overlays/modules/mercurial/mercurial.py |
| 129 |
index fa32555..0b5e7e5 100644 |
| 130 |
--- a/layman/overlays/modules/mercurial/mercurial.py |
| 131 |
+++ b/layman/overlays/modules/mercurial/mercurial.py |
| 132 |
@@ -76,7 +76,7 @@ class MercurialOverlay(OverlaySource): |
| 133 |
|
| 134 |
# hg clone SOURCE TARGET |
| 135 |
if len(cfg_opts): |
| 136 |
- args = ['clone', cfg_opts, src, target] |
| 137 |
+ args = ['clone'] + cfg_opts.split() + [src, target] |
| 138 |
else: |
| 139 |
args = ['clone', src, target] |
| 140 |
|
| 141 |
@@ -123,7 +123,7 @@ class MercurialOverlay(OverlaySource): |
| 142 |
|
| 143 |
# hg pull -u SOURCE |
| 144 |
if len(cfg_opts): |
| 145 |
- args = ['pull', '-u', cfg_opts, self.src] |
| 146 |
+ args = ['pull', '-u'] + cfg_opts.split() + [self.src] |
| 147 |
else: |
| 148 |
args = ['pull', '-u', self.src] |
| 149 |
|
| 150 |
|
| 151 |
diff --git a/layman/overlays/modules/rsync/rsync.py b/layman/overlays/modules/rsync/rsync.py |
| 152 |
index f540b76..e6a6308 100644 |
| 153 |
--- a/layman/overlays/modules/rsync/rsync.py |
| 154 |
+++ b/layman/overlays/modules/rsync/rsync.py |
| 155 |
@@ -75,7 +75,7 @@ class RsyncOverlay(OverlaySource): |
| 156 |
if self.config['quiet']: |
| 157 |
args.append('-q') |
| 158 |
if len(cfg_opts): |
| 159 |
- args.append(cfg_opts) |
| 160 |
+ args.extend(cfg_opts.split()) |
| 161 |
args.append(self.src + '/') |
| 162 |
args.append(target) |
| 163 |
|
| 164 |
|
| 165 |
diff --git a/layman/overlays/modules/svn/svn.py b/layman/overlays/modules/svn/svn.py |
| 166 |
index 586a9dc..fff8805 100644 |
| 167 |
--- a/layman/overlays/modules/svn/svn.py |
| 168 |
+++ b/layman/overlays/modules/svn/svn.py |
| 169 |
@@ -80,7 +80,7 @@ class SvnOverlay(OverlaySource): |
| 170 |
if self.config['quiet']: |
| 171 |
args.append('-q') |
| 172 |
if len(cfg_opts): |
| 173 |
- args.append(cfg_opts) |
| 174 |
+ args.extend(cfg_opts.split()) |
| 175 |
|
| 176 |
src = self._fix_svn_source(self.src) |
| 177 |
args.append(src) |
| 178 |
@@ -135,7 +135,7 @@ class SvnOverlay(OverlaySource): |
| 179 |
if self.config['quiet']: |
| 180 |
args.append('-q') |
| 181 |
if len(cfg_opts): |
| 182 |
- args.append(cfg_opts) |
| 183 |
+ args.extend(cfg_opts.split()) |
| 184 |
args.append(self.target) |
| 185 |
|
| 186 |
return self.postsync( |
Archives