Commit c5ac51bb authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

ssconf: Small error message fixes



- Include filename in error message
- s/ip/IP/
- Stop using superfluous variable
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 83a14695
......@@ -328,10 +328,10 @@ class SimpleStore(object):
except EnvironmentError, err:
if err.errno == errno.ENOENT and default is not None:
return default
raise errors.ConfigurationError("Can't read from the ssconf file:"
" '%s'" % str(err))
data = data.rstrip("\n")
return data
raise errors.ConfigurationError("Can't read ssconf file %s: %s" %
(filename, str(err)))
return data.rstrip("\n")
def WriteFiles(self, values):
"""Writes ssconf files used by external scripts.
......@@ -513,7 +513,7 @@ class SimpleStore(object):
return int(self._ReadFile(constants.SS_PRIMARY_IP_FAMILY,
default=netutils.IP4Address.family))
except (ValueError, TypeError), err:
raise errors.ConfigurationError("Error while trying to parse primary ip"
raise errors.ConfigurationError("Error while trying to parse primary IP"
" family: %s" % err)
......
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