Compare commits
No commits in common. "d74c3a2d459dce5d180ab96ceee0cab1c519e230" and "31254e8174d513a296aeacb06f3784aea5e7fce0" have entirely different histories.
d74c3a2d45
...
31254e8174
@ -179,10 +179,6 @@ def upload_ova(zkhandler, pool, name, ova_size):
|
||||
}
|
||||
retcode = 400
|
||||
return output, retcode
|
||||
else:
|
||||
ova_script = "default_ova"
|
||||
else:
|
||||
ova_script = "ova"
|
||||
|
||||
ova_archive = None
|
||||
|
||||
@ -418,7 +414,7 @@ def upload_ova(zkhandler, pool, name, ova_size):
|
||||
None,
|
||||
None,
|
||||
userdata=None,
|
||||
script=ova_script,
|
||||
script="default_ova",
|
||||
ova=name,
|
||||
arguments=None,
|
||||
)
|
||||
|
@ -121,9 +121,6 @@ def format_bytes_tohuman(databytes):
|
||||
|
||||
|
||||
def format_bytes_fromhuman(datahuman):
|
||||
if not isinstance(datahuman, str):
|
||||
datahuman = str(datahuman)
|
||||
|
||||
if not re.search(r"[A-Za-z]+", datahuman):
|
||||
dataunit = "B"
|
||||
datasize = float(datahuman)
|
||||
|
Loading…
x
Reference in New Issue
Block a user