Commit 6ee7102a authored by Guido Trotter's avatar Guido Trotter
Browse files

OSFromDisk: handle variants when loading os



When we load an OS from disk, we need _TryOSFromDisk to get the real
name, without any variant. This allows any functionality that uses the
instance OS to handle a name with a variant.
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarOlivier Tharan <olive@google.com>
parent f11280b5
......@@ -1757,7 +1757,8 @@ def OSFromDisk(name, base_dir=None):
@raise RPCFail: if we don't find a valid OS
"""
status, payload = _TryOSFromDisk(name, base_dir)
name_only = name.split('+',1)[0]
status, payload = _TryOSFromDisk(name_only, base_dir)
if not status:
_Fail(payload)
......
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