Merge pull request #9609 from wanyaoqi/bugfix/wyq/fix-list-image-by-os-arch

fix(glance): list image by os arch use startwith
This commit is contained in:
Zexi Li
2020-12-24 17:34:23 +08:00
committed by GitHub
+2 -2
View File
@@ -42,11 +42,11 @@ func (manager *SMultiArchResourceBaseManager) ListItemFilter(
if len(query.OsArch) > 0 {
if query.OsArch == compute.OS_ARCH_X86 {
q = q.Filter(sqlchemy.OR(
sqlchemy.Equals(q.Field("os_arch"), query.OsArch),
sqlchemy.Startswith(q.Field("os_arch"), query.OsArch),
sqlchemy.IsNullOrEmpty(q.Field("os_arch")),
))
} else {
q = q.Equals("os_arch", query.OsArch)
q = q.Startswith("os_arch", query.OsArch)
}
}
return q, nil