Commit 23ae6fa1 authored by Marco Mariani's avatar Marco Mariani

grammar

parent 6894b3c2
......@@ -90,10 +90,10 @@ class ExecError(SlapError):
def _call(cmd_args, stdout=None, stderr=None, dry_run=False):
"""
Wrapper for subprocess.call() which'll secure the usage of external program's.
Wrapper for subprocess.call() which will secure the usage of external programs.
Args:
cmd_args: list of strings representing the command and all it's needed args
cmd_args: list of strings representing the command and all its needed args
stdout/stderr: only precise PIPE (from subprocess) if you don't want the
command to create output on the regular stream
"""
......@@ -542,7 +542,7 @@ def prepare_from_scratch(config):
temp_dir=temp_directory,
computer_id=computer_id)
# Prepare SlapOS Suse Server confuguration
# Prepare SlapOS Suse Server configuration
if config.need_ssh:
get_ssh_keys(temp_directory)
......@@ -558,7 +558,7 @@ def prepare_from_scratch(config):
print >>sys.stderr, err.msg
return_code = 16
except SystemExit as err:
# Catch exception raise by optparse
# Catch exception raised by optparse
return_code = err
if os.path.exists(temp_directory):
print "Deleting directory: %s" % temp_directory
......@@ -666,7 +666,7 @@ def slapprepare():
print >>sys.stderr, err.msg
return_code = 16
except SystemExit as err:
# Catch exception raise by optparse
# Catch exception raised by optparse
return_code = err
sys.exit(return_code)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment