diff options
| author |   Amy Fong <amy.fong@windriver.com> | 2014-06-26 10:28:47 -0400 |
|---|---|---|
| committer |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-17 00:10:30 -0400 |
| commit | 3651c6289525a664c7b93d5945fe94f9283aa545 (patch) | |
| tree | 6a3a8673f7b1dc9931f89a482b48aba227b5093c /meta-openstack | |
| parent | 506884b1969ee51e04fd21c7b89e1e7ba41e06e6 (diff) | |
| download | meta-cloud-services-3651c6289525a664c7b93d5945fe94f9283aa545.tar.gz meta-cloud-services-3651c6289525a664c7b93d5945fe94f9283aa545.tar.bz2 meta-cloud-services-3651c6289525a664c7b93d5945fe94f9283aa545.zip | |
neutron: uuid whitespace check fix
The uuid candidate may be none, need to check for this.
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Diffstat (limited to 'meta-openstack')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-neutron/uuid_wscheck.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/uuid_wscheck.patch b/meta-openstack/recipes-devtools/python/python-neutron/uuid_wscheck.patch index ba09f7ba..f7050912 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron/uuid_wscheck.patch +++ b/meta-openstack/recipes-devtools/python/python-neutron/uuid_wscheck.patch @@ -7,7 +7,7 @@ diff -uNr git.orig/neutron/api/v2/attributes.py git/neutron/api/v2/attributes.py def _validate_uuid(data, valid_values=None): if not uuidutils.is_uuid_like(data): - msg = _("'%s' is not a valid UUID") % data -+ if data != data.rstrip(): ++ if data is not None and data != data.rstrip(): + msg = _("'%s' is not a valid UUID: trailing whitespace?") % data + else: + msg = _("'%s' is not a valid UUID") % data @@ -24,7 +24,7 @@ diff -uNr git.orig/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py git/neutron else: - LOG.debug(_('%s is not a valid uuid'), segment) - msg = _("'%s' is not a valid UUID") % segment -+ if segment != segment.rstrip(): ++ if segment is not None and segment != segment.rstrip(): + msg = _("'%s' is not a valid UUID: trailing whitespace?") % segment + else: + msg = _("'%s' is not a valid UUID") % segment |