diff --git a/scripts/static-vdis b/scripts/static-vdis index 9ca8b1d352a..ec24848e934 100755 --- a/scripts/static-vdis +++ b/scripts/static-vdis @@ -97,25 +97,25 @@ def sr_attach(ty, device_config): return call_volume_plugin(ty, "SR.attach", args) def list_vdis(): - all = [] + files = [] try: - all = os.listdir(main_dir) - except: + files = os.listdir(main_dir) + except OSError: # All possible errors are subclasses of OSError pass - return list(map(load, all)) + return list(map(load, files)) def fresh_name(): - all = [] + """Return a unique name for a new static VDI configuration directory""" try: - all = os.listdir(main_dir) - for i in range(0, len(all) + 1): # guarantees to find a unique number + files = os.listdir(main_dir) + for i in range(0, len(files) + 1): # guarantees to find a unique number i = str(i) - if not(i in all): + if i not in files: return i - except: + except OSError: # All possible errors are subclasses of OSError # Directory doesn't exist os.mkdir(main_dir) - return "0" + return "0" # Always return a string, fixes pyright error by not returning None def to_string_list(d):