Commit 4b918e13 authored by Mike Hibler's avatar Mike Hibler

Fetch osinfo_version info rather than osinfo info.

Also fix incorrect check for a dictionary entry that doesn't exist.
parent f201d7bd
...@@ -965,7 +965,7 @@ class osid: ...@@ -965,7 +965,7 @@ class osid:
osid["fullosid"] = osid["osid"] osid["fullosid"] = osid["osid"]
osid["osid"] = osid["osname"] osid["osid"] = osid["osname"]
if not osid["OS"] or len(osid["OS"]) == 0: if not osid.has_key("OS") or len(osid["OS"]) == 0:
osid["OS"] = "(None)" osid["OS"] = "(None)"
pass pass
...@@ -987,7 +987,7 @@ class osid: ...@@ -987,7 +987,7 @@ class osid:
output="Improperly formed osid!") output="Improperly formed osid!")
# Get the listing that is accessible to this user and # Get the listing that is accessible to this user and
res = DBQueryFatal("SELECT distinct o.* FROM os_info as o " res = DBQueryFatal("SELECT distinct v.* FROM os_info as o "
"left join os_info_versions as v on " "left join os_info_versions as v on "
" v.osid=o.osid and v.vers=o.version " " v.osid=o.osid and v.vers=o.version "
"left join group_membership as g on g.pid=o.pid " "left join group_membership as g on g.pid=o.pid "
...@@ -1005,7 +1005,7 @@ class osid: ...@@ -1005,7 +1005,7 @@ class osid:
osid["fullosid"] = osid["osid"] osid["fullosid"] = osid["osid"]
osid["osid"] = osid["osname"] osid["osid"] = osid["osname"]
if not osid["OS"] or len(osid["OS"]) == 0: if not osid.has_key("OS") or len(osid["OS"]) == 0:
osid["OS"] = "(None)" osid["OS"] = "(None)"
pass pass
......
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