|
51 | 51 | }
|
52 | 52 |
|
53 | 53 |
|
54 |
| -def split_doubledash(argv): |
| 54 | +def split_doubledash(argv, maxsplit=None): |
55 | 55 | """Split on '--', for spearating arguments"""
|
56 | 56 | new = [ ]
|
57 | 57 | last = 0
|
| 58 | + nsplit = 0 |
58 | 59 | for i, x in enumerate(argv):
|
59 | 60 | if x == '--':
|
60 | 61 | new.append(argv[last:i])
|
61 | 62 | last = i + 1
|
| 63 | + nsplit += 1 |
| 64 | + if maxsplit is not None and nsplit >= maxsplit: |
| 65 | + break |
62 | 66 | new.append(argv[last:])
|
63 | 67 | return new
|
64 | 68 |
|
@@ -256,7 +260,7 @@ def run(self):
|
256 | 260 |
|
257 | 261 | before '--': the modules to load
|
258 | 262 | after '--': the Python command to run after loading"""
|
259 |
| - argv, rest = split_doubledash(self.argv) |
| 263 | + argv, rest = split_doubledash(self.argv, 1) |
260 | 264 | parser = argparse.ArgumentParser()
|
261 | 265 | parser.add_argument('--purge', action='store_true', default=False, help="Purge existing modules first")
|
262 | 266 | parser.add_argument('module', nargs='+')
|
@@ -320,7 +324,7 @@ def run(self):
|
320 | 324 |
|
321 | 325 | before '--': the modules to load
|
322 | 326 | after '--': the Python command to run after loading"""
|
323 |
| - argv, rest = split_doubledash(self.argv) |
| 327 | + argv, rest = split_doubledash(self.argv, 1) |
324 | 328 | parser = argparse.ArgumentParser()
|
325 | 329 | #parser.add_argument('--purge', action='store_true', default=False, help="Purge existing modules first")
|
326 | 330 | parser.add_argument('path')
|
@@ -389,7 +393,7 @@ def setup(self):
|
389 | 393 | replace=self.replace, prefix=self.prefix)
|
390 | 394 |
|
391 | 395 | def run(self):
|
392 |
| - argv, rest = split_doubledash(self.argv) |
| 396 | + argv, rest = split_doubledash(self.argv, 1) |
393 | 397 | parser = argparse.ArgumentParser()
|
394 | 398 | parser.add_argument('image', help='Dcker image name')
|
395 | 399 | #parser.add_argument('--mount', '-m', action='append', default=[],
|
@@ -524,7 +528,7 @@ def setup(self):
|
524 | 528 | replace=self.replace, prefix=self.prefix)
|
525 | 529 |
|
526 | 530 | def run(self):
|
527 |
| - argv, rest = split_doubledash(self.argv) |
| 531 | + argv, rest = split_doubledash(self.argv, 1) |
528 | 532 | parser = argparse.ArgumentParser()
|
529 | 533 | parser.add_argument('image', help='image name')
|
530 | 534 | #parser.add_argument('--mount', '-m', action='append', default=[],
|
|
0 commit comments