Revision e02b9114 lib/backend.py
b/lib/backend.py | ||
---|---|---|
1682 | 1682 |
data holding either the vaid versions or an error message |
1683 | 1683 |
|
1684 | 1684 |
""" |
1685 |
api_file = os.path.sep.join([os_dir, constants.OS_API_FILE])
|
|
1685 |
api_file = utils.PathJoin(os_dir, constants.OS_API_FILE)
|
|
1686 | 1686 |
|
1687 | 1687 |
try: |
1688 | 1688 |
st = os.stat(api_file) |
... | ... | |
1738 | 1738 |
logging.exception("Can't list the OS directory %s: %s", dir_name, err) |
1739 | 1739 |
break |
1740 | 1740 |
for name in f_names: |
1741 |
os_path = os.path.sep.join([dir_name, name])
|
|
1741 |
os_path = utils.PathJoin(dir_name, name)
|
|
1742 | 1742 |
status, os_inst = _TryOSFromDisk(name, base_dir=dir_name) |
1743 | 1743 |
if status: |
1744 | 1744 |
diagnose = "" |
... | ... | |
1789 | 1789 |
os_files[constants.OS_VARIANTS_FILE] = '' |
1790 | 1790 |
|
1791 | 1791 |
for filename in os_files: |
1792 |
os_files[filename] = os.path.sep.join([os_dir, filename])
|
|
1792 |
os_files[filename] = utils.PathJoin(os_dir, filename)
|
|
1793 | 1793 |
|
1794 | 1794 |
try: |
1795 | 1795 |
st = os.stat(os_files[filename]) |
Also available in: Unified diff