apachedex: fix argument parsing

Use shlex from standard library which splits arguments properly instead of
implementing our own buggy version.

slapos/apachedex.py

@@ -32,7 +32,7 @@ from __future__ import print_function
 import os, errno
 import subprocess
 import argparse
-import time
+import shlex
 from datetime import date
 
 # run_apachedex.py <apachedex_executable> /srv/etc/output_folder script_name
@@ -61,8 +61,7 @@ def build_command(apachedex_executable, output_file,
     raise ValueError("log_list: no log files to analyse were provided")
 
   if config:
-    config = filter(None, [x.strip() for x in config.split(' ')])
-    argument_list += config
+    argument_list.extend(shlex.split(config))
 
   argument_list.append('--error-detail')
   argument_list += log_list

slapos/test/test_apachedex.py

@@ -64,6 +64,19 @@ class TestApachedexCommand(unittest.TestCase):
                                '--base', 'bar', 'foo',
                                '--default', 'foo',
                                '--error-detail', self.acesslog1, self.acesslog2 ])
+
+  def test_complexCommandEscape(self):
+    command = build_command(self.apachedex,
+                            'bar.html',
+                            [self.acesslog1, self.acesslog2],
+                            '--base "foo bar"')
+
+    self.assertEqual(command, ['/bin/apachedex',
+                               '--js-embed',
+                               '--out', 'bar.html',
+                               '--base', 'foo bar',
+                               '--error-detail', self.acesslog1, self.acesslog2 ])
+
   def test_raiseErro(self):
     self.assertRaises(ValueError, build_command, self.apachedex, 'foo.html', [])
 if __name__ == '__main__':