| 1 |
commit: eb4bff6276f7511d21ac6bb04d4d56a39b844593 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 20 15:30:13 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 20 15:30:13 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=eb4bff62 |
| 7 |
|
| 8 |
*_DEFAULT_OPTS: shlex for embedded quotes |
| 9 |
|
| 10 |
--- |
| 11 |
bin/ebuild | 3 ++- |
| 12 |
bin/egencache | 3 ++- |
| 13 |
bin/quickpkg | 3 ++- |
| 14 |
bin/repoman | 3 ++- |
| 15 |
4 files changed, 8 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/bin/ebuild b/bin/ebuild |
| 18 |
index 5538600..4fdc762 100755 |
| 19 |
--- a/bin/ebuild |
| 20 |
+++ b/bin/ebuild |
| 21 |
@@ -89,7 +89,8 @@ if len(pargs) < 2: |
| 22 |
parser.error("missing required args") |
| 23 |
|
| 24 |
if not opts.ignore_default_opts: |
| 25 |
- default_opts = portage.settings.get("EBUILD_DEFAULT_OPTS", "").split() |
| 26 |
+ default_opts = portage.util.shlex_split( |
| 27 |
+ portage.settings.get("EBUILD_DEFAULT_OPTS", "")) |
| 28 |
opts, pargs = parser.parse_args(default_opts + sys.argv[1:]) |
| 29 |
|
| 30 |
debug = opts.debug |
| 31 |
|
| 32 |
diff --git a/bin/egencache b/bin/egencache |
| 33 |
index 133903d..71f012a 100755 |
| 34 |
--- a/bin/egencache |
| 35 |
+++ b/bin/egencache |
| 36 |
@@ -873,7 +873,8 @@ def egencache_main(args): |
| 37 |
|
| 38 |
default_opts = None |
| 39 |
if not options.ignore_default_opts: |
| 40 |
- default_opts = settings.get('EGENCACHE_DEFAULT_OPTS', '').split() |
| 41 |
+ default_opts = portage.util.shlex_split( |
| 42 |
+ settings.get('EGENCACHE_DEFAULT_OPTS', '')) |
| 43 |
|
| 44 |
if default_opts: |
| 45 |
parser, options, args = parse_args(default_opts + args) |
| 46 |
|
| 47 |
diff --git a/bin/quickpkg b/bin/quickpkg |
| 48 |
index 19d90b0..16118ab 100755 |
| 49 |
--- a/bin/quickpkg |
| 50 |
+++ b/bin/quickpkg |
| 51 |
@@ -310,7 +310,8 @@ if __name__ == "__main__": |
| 52 |
help="include files protected by CONFIG_PROTECT that have not been modified since installation (as a security precaution, default is 'n')") |
| 53 |
options, args = parser.parse_args(sys.argv[1:]) |
| 54 |
if not options.ignore_default_opts: |
| 55 |
- default_opts = portage.settings.get("QUICKPKG_DEFAULT_OPTS","").split() |
| 56 |
+ default_opts = shlex_split( |
| 57 |
+ portage.settings.get("QUICKPKG_DEFAULT_OPTS", "")) |
| 58 |
options, args = parser.parse_args(default_opts + sys.argv[1:]) |
| 59 |
if not args: |
| 60 |
parser.error("no packages atoms given") |
| 61 |
|
| 62 |
diff --git a/bin/repoman b/bin/repoman |
| 63 |
index 5243e61..20832ec 100755 |
| 64 |
--- a/bin/repoman |
| 65 |
+++ b/bin/repoman |
| 66 |
@@ -265,7 +265,8 @@ def ParseArgs(argv, qahelp): |
| 67 |
opts, args = parser.parse_args(argv[1:]) |
| 68 |
|
| 69 |
if not opts.ignore_default_opts: |
| 70 |
- default_opts = repoman_settings.get("REPOMAN_DEFAULT_OPTS", "").split() |
| 71 |
+ default_opts = portage.util.shlex_split( |
| 72 |
+ repoman_settings.get("REPOMAN_DEFAULT_OPTS", "")) |
| 73 |
if default_opts: |
| 74 |
opts, args = parser.parse_args(default_opts + sys.argv[1:]) |
Archives