*_DEFAULT_OPTS: shlex for embedded quotes

diff --git a/bin/ebuild b/bin/ebuild
index 55386005f91aa4fade5b54ee740e5d4e111759f0..4fdc762419854b8cd29dd09a1756a7600b7f760c 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -89,7 +89,8 @@ if len(pargs) < 2:
        parser.error("missing required args")
 
 if not opts.ignore_default_opts:
-       default_opts = portage.settings.get("EBUILD_DEFAULT_OPTS", "").split()
+       default_opts = portage.util.shlex_split(
+               portage.settings.get("EBUILD_DEFAULT_OPTS", ""))
        opts, pargs = parser.parse_args(default_opts + sys.argv[1:])
 
 debug = opts.debug

diff --git a/bin/egencache b/bin/egencache
index 133903d8e590e8844b5e7c51d23f8b17a89b1df4..71f012a7a966307816df143b98d501817bcb3b68 100755 (executable)
--- a/bin/egencache
+++ b/bin/egencache
@@ -873,7 +873,8 @@ def egencache_main(args):
 
        default_opts = None
        if not options.ignore_default_opts:
-               default_opts = settings.get('EGENCACHE_DEFAULT_OPTS', '').split()
+               default_opts = portage.util.shlex_split(
+                       settings.get('EGENCACHE_DEFAULT_OPTS', ''))
 
        if default_opts:
                parser, options, args = parse_args(default_opts + args)

diff --git a/bin/quickpkg b/bin/quickpkg
index 19d90b0d3b2d35a9bf10e660717f2f972cbcfdbf..16118ab25a7cc0d063e2e16deadc13e585eaaf73 100755 (executable)
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -310,7 +310,8 @@ if __name__ == "__main__":
                help="include files protected by CONFIG_PROTECT that have not been modified since installation (as a security precaution, default is 'n')")
        options, args = parser.parse_args(sys.argv[1:])
        if not options.ignore_default_opts:
-               default_opts = portage.settings.get("QUICKPKG_DEFAULT_OPTS","").split()
+               default_opts = shlex_split(
+                       portage.settings.get("QUICKPKG_DEFAULT_OPTS", ""))
                options, args = parser.parse_args(default_opts + sys.argv[1:])
        if not args:
                parser.error("no packages atoms given")

diff --git a/bin/repoman b/bin/repoman
index 5243e61ec9704c772677d44438341e9e5e503748..20832ec8c37796f05e86ed4306a4d9f6c409e71d 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -265,7 +265,8 @@ def ParseArgs(argv, qahelp):
        opts, args = parser.parse_args(argv[1:])
 
        if not opts.ignore_default_opts:
-               default_opts = repoman_settings.get("REPOMAN_DEFAULT_OPTS", "").split()
+               default_opts = portage.util.shlex_split(
+                       repoman_settings.get("REPOMAN_DEFAULT_OPTS", ""))
                if default_opts:
                        opts, args = parser.parse_args(default_opts + sys.argv[1:])