Revision c4feafe8 lib/utils.py
b/lib/utils.py | ||
---|---|---|
310 | 310 |
return rr |
311 | 311 |
|
312 | 312 |
for relname in sorted(dir_contents): |
313 |
fname = os.path.join(dir_name, relname)
|
|
313 |
fname = PathJoin(dir_name, relname)
|
|
314 | 314 |
if not (os.path.isfile(fname) and os.access(fname, os.X_OK) and |
315 | 315 |
constants.EXT_PLUGIN_MASK.match(relname) is not None): |
316 | 316 |
rr.append((relname, constants.RUNPARTS_SKIP, None)) |
... | ... | |
1607 | 1607 |
daemon name |
1608 | 1608 |
|
1609 | 1609 |
""" |
1610 |
return os.path.join(constants.RUN_GANETI_DIR, "%s.pid" % name)
|
|
1610 |
return PathJoin(constants.RUN_GANETI_DIR, "%s.pid" % name)
|
|
1611 | 1611 |
|
1612 | 1612 |
|
1613 | 1613 |
def EnsureDaemon(name): |
... | ... | |
2106 | 2106 |
|
2107 | 2107 |
for (curpath, _, files) in os.walk(path): |
2108 | 2108 |
for filename in files: |
2109 |
st = os.lstat(os.path.join(curpath, filename))
|
|
2109 |
st = os.lstat(PathJoin(curpath, filename))
|
|
2110 | 2110 |
size += st.st_size |
2111 | 2111 |
|
2112 | 2112 |
return BytesToMebibyte(size) |
Also available in: Unified diff