From c728219bc970b4a5f738c22ee2092f6d12cc9548 Mon Sep 17 00:00:00 2001
From: Joona Hoikkala <joona@kuori.org>
Date: Fri, 25 Dec 2015 10:18:24 +0200
Subject: [PATCH] Changed define and version commands from string to list to
 avoid unneeded parsing later on

---
 .../letsencrypt_apache/configurator.py               |  2 +-
 letsencrypt-apache/letsencrypt_apache/constants.py   | 12 ++++++------
 letsencrypt-apache/letsencrypt_apache/parser.py      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py
index 90f60da15..6c6685257 100644
--- a/letsencrypt-apache/letsencrypt_apache/configurator.py
+++ b/letsencrypt-apache/letsencrypt_apache/configurator.py
@@ -1343,7 +1343,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
         """
         try:
             stdout, _ = le_util.run_script(
-                constants.os_constant("version_cmd").split(" "))
+                constants.os_constant("version_cmd"))
         except errors.SubprocessError:
             raise errors.PluginError(
                 "Unable to run %s -v" % self.conf("ctl"))
diff --git a/letsencrypt-apache/letsencrypt_apache/constants.py b/letsencrypt-apache/letsencrypt_apache/constants.py
index a859f57d4..6b248b6ad 100644
--- a/letsencrypt-apache/letsencrypt_apache/constants.py
+++ b/letsencrypt-apache/letsencrypt_apache/constants.py
@@ -7,8 +7,8 @@ CLI_DEFAULTS_DEBIAN = dict(
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/sites-available",
     ctl="apache2ctl",
-    version_cmd="apache2ctl -v",
-    define_cmd="apache2ctl -t -D DUMP_RUN_CFG",
+    version_cmd=['apache2ctl', '-v'],
+    define_cmd=['apache2ctl', '-t', '-D', 'DUMP_RUN_CFG'],
     enmod="a2enmod",
     dismod="a2dismod",
     le_vhost_ext="-le-ssl.conf",
@@ -20,8 +20,8 @@ CLI_DEFAULTS_CENTOS = dict(
     server_root="/etc/httpd",
     vhost_root="/etc/httpd/conf.d",
     ctl="apachectl",
-    version_cmd="apachectl -v",
-    define_cmd="apachectl -t -D DUMP_RUN_CFG",
+    version_cmd=['apachectl', '-v'],
+    define_cmd=['apachectl', '-t', '-D', 'DUMP_RUN_CFG'],
     enmod=None,
     dismod=None,
     le_vhost_ext="-le-ssl.conf",
@@ -33,8 +33,8 @@ CLI_DEFAULTS_GENTOO = dict(
     server_root="/etc/apache2",
     vhost_root="/etc/apache2/vhosts.d",
     ctl="apache2ctl",
-    version_cmd="/usr/sbin/apache2 -v",
-    define_cmd="/usr/sbin/apache2 -t -D DUMP_RUN_CFG",
+    version_cmd=['/usr/sbin/apache2', '-v'],
+    define_cmd=['/usr/sbin/apache2', '-t', '-D', 'DUMP_RUN_CFG'],
     enmod=None,
     dismod=None,
     le_vhost_ext="-le-ssl.conf",
diff --git a/letsencrypt-apache/letsencrypt_apache/parser.py b/letsencrypt-apache/letsencrypt_apache/parser.py
index b1d604631..12704c859 100644
--- a/letsencrypt-apache/letsencrypt_apache/parser.py
+++ b/letsencrypt-apache/letsencrypt_apache/parser.py
@@ -129,7 +129,7 @@ class ApacheParser(object):
         """
         try:
             proc = subprocess.Popen(
-                constants.os_constant("define_cmd").split(" "),
+                constants.os_constant("define_cmd"),
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE)
             stdout, stderr = proc.communicate()