From 7fa07e0c7a9baf7d5046ac6be8d00624b9984b67 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 17 Jun 2010 18:56:04 +0200 Subject: [PATCH] Revert "[molecule] builtin_plugin: use shlex when calling mkisofs" This reverts commit 63515f0f52c5ff1244c584256b89baa5b6f0c816. --- molecule/specs/plugins/builtin_plugin.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/molecule/specs/plugins/builtin_plugin.py b/molecule/specs/plugins/builtin_plugin.py index e750773..85594ad 100644 --- a/molecule/specs/plugins/builtin_plugin.py +++ b/molecule/specs/plugins/builtin_plugin.py @@ -18,7 +18,6 @@ import os import shutil -import shlex from molecule.i18n import _ from molecule.output import red, brown, blue, green, purple, darkgreen, \ darkred, bold, darkblue, readtext @@ -579,15 +578,13 @@ class IsoHandler(GenericExecutionStep, BuiltinHandlerMixin): args.extend(self._config['iso_builder_builtin_args']) args.extend(self.metadata.get('extra_mkisofs_parameters',[])) if self.iso_title.strip(): - args.extend(["-V", '"'+self.iso_title[:30]+'"']) - args.extend(['-o', self.dest_iso, self.source_path]) + args.extend(["-V", '"', self.iso_title[:30], '"']) + args.extend(['-o',self.dest_iso, self.source_path]) self._output.output("[%s|%s] %s: %s" % ( blue("IsoHandler"), darkred(self.spec_name), _("spawning"), args, ) ) - # make shell interpreter happy - args = shlex.split(' '.join(args)) rc = molecule.utils.exec_cmd(args) if rc != 0: self._output.output("[%s|%s] %s: %s" % (