Merge pull request #4030 from tlindner/fix_connonical_options

Fix canonical command line option.
This commit is contained in:
R. Belmont 2018-10-07 11:38:09 -04:00 committed by GitHub
commit 7b42e2f799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -389,9 +389,9 @@ namespace
if (!same_name)
result.push_back(image.brief_instance_name());
if (strcmp(image.device_typename(image.image_type()), image.instance_name().c_str()) == 0)
if( image.instance_name() != image.cannonical_instance_name() )
{
result.push_back(image.instance_name() + "1");
result.push_back(image.cannonical_instance_name());
if (!same_name)
result.push_back(image.brief_instance_name() + "1");
}