Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
4b918e13
Commit
4b918e13
authored
Nov 18, 2014
by
Mike Hibler
Browse files
Fetch osinfo_version info rather than osinfo info.
Also fix incorrect check for a dictionary entry that doesn't exist.
parent
f201d7bd
Changes
1
Hide whitespace changes
Inline
Side-by-side
xmlrpc/emulabserver.py.in
View file @
4b918e13
...
...
@@ -965,7 +965,7 @@ class osid:
osid
[
"fullosid"
]
=
osid
[
"osid"
]
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)"
pass
...
...
@@ -987,7 +987,7 @@ class osid:
output
=
"Improperly formed osid!"
)
# 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 "
" v.osid=o.osid and v.vers=o.version "
"left join group_membership as g on g.pid=o.pid "
...
...
@@ -1005,7 +1005,7 @@ class osid:
osid
[
"fullosid"
]
=
osid
[
"osid"
]
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)"
pass
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment