diff --git a/rubick/discovery.py b/rubick/discovery.py index e458ae3..8734e32 100644 --- a/rubick/discovery.py +++ b/rubick/discovery.py @@ -610,8 +610,7 @@ class OpenstackDiscovery(object): config_locations_result = client.run( ['bash', '-c', 'mysqld --help --verbose ' - '| grep "Default options are read from the following files in ' - 'the given order" -A 1']) + '| grep "Default options are read from" -A 1']) config_locations = config_locations_result.output.strip().split( "\n")[-1].split() for path in config_locations: diff --git a/rubick/model.py b/rubick/model.py index f6eb544..39a2701 100644 --- a/rubick/model.py +++ b/rubick/model.py @@ -244,11 +244,11 @@ class OpenstackComponent(Service): if isinstance(type_validation_result, Issue): type_validation_result.mark = parameter\ .value.start_mark.merge( - type_validation_result.mark) + type_validation_result.mark) type_validation_result.message = \ 'Property "%s" in section "%s": %s' % ( - parameter.name.text, section_name, - type_validation_result.message) + parameter.name.text, section_name, + type_validation_result.message) report_issue(type_validation_result) config.set( diff --git a/rubick/schema.py b/rubick/schema.py index c0b382e..268a49d 100644 --- a/rubick/schema.py +++ b/rubick/schema.py @@ -200,13 +200,8 @@ class SchemaIssue(Issue): class InvalidValueError(MarkedIssue): def __init__(self, message, mark=Mark('', 0, 0)): - super( - InvalidValueError, - self).__init__( - Issue.ERROR, - 'Invalid value: ' + - message, - mark) + super(InvalidValueError,self).__init__( + Issue.ERROR, 'Invalid value: ' + message, mark) class TypeValidator(object):