Revision 65fe4693 lib/backend.py
| b/lib/backend.py | ||
|---|---|---|
| 942 | 942 |
if search_path is None: |
| 943 | 943 |
search_path = constants.OS_SEARCH_PATH |
| 944 | 944 |
|
| 945 |
for dir in search_path: |
|
| 946 |
t_os_dir = os.path.sep.join([dir, name]) |
|
| 945 |
for dir_name in search_path:
|
|
| 946 |
t_os_dir = os.path.sep.join([dir_name, name])
|
|
| 947 | 947 |
if os.path.isdir(t_os_dir): |
| 948 |
return dir
|
|
| 948 |
return dir_name
|
|
| 949 | 949 |
|
| 950 | 950 |
return None |
| 951 | 951 |
|
| ... | ... | |
| 1006 | 1006 |
top_dirs = constants.OS_SEARCH_PATH |
| 1007 | 1007 |
|
| 1008 | 1008 |
result = [] |
| 1009 |
for dir in top_dirs: |
|
| 1010 |
if os.path.isdir(dir): |
|
| 1009 |
for dir_name in top_dirs:
|
|
| 1010 |
if os.path.isdir(dir_name):
|
|
| 1011 | 1011 |
try: |
| 1012 |
f_names = utils.ListVisibleFiles(dir) |
|
| 1012 |
f_names = utils.ListVisibleFiles(dir_name)
|
|
| 1013 | 1013 |
except EnvironmentError, err: |
| 1014 |
logger.Error("Can't list the OS directory %s: %s" % (dir,str(err)))
|
|
| 1014 |
logger.Error("Can't list the OS directory %s: %s" %
|
|
| 1015 |
(dir_name, str(err))) |
|
| 1015 | 1016 |
break |
| 1016 | 1017 |
for name in f_names: |
| 1017 | 1018 |
try: |
| 1018 |
os_inst = OSFromDisk(name, base_dir=dir) |
|
| 1019 |
os_inst = OSFromDisk(name, base_dir=dir_name)
|
|
| 1019 | 1020 |
result.append(os_inst) |
| 1020 | 1021 |
except errors.InvalidOS, err: |
| 1021 | 1022 |
result.append(objects.OS.FromInvalidOS(err)) |
Also available in: Unified diff