Fix host paths on Windows.

This commit is contained in:
Chris Johns
2013-02-27 16:04:29 +11:00
parent 9262cd4947
commit bc710668cf
2 changed files with 5 additions and 2 deletions

View File

@@ -461,8 +461,9 @@ def get_configs(opts, _defaults):
configs = { 'paths': [], 'files': [] }
for cp in opts.expand('%{_configdir}', _defaults).split(':'):
configs['paths'] += [path.host(path.abspath(cp))]
configs['files'] += _scan(cp, ['.cfg', '.bset'])
hcp = path.host(path.abspath(cp))
configs['paths'] += [hcp]
configs['files'] += _scan(hcp, ['.cfg', '.bset'])
configs['files'] = sorted(configs['files'])
return configs

View File

@@ -85,6 +85,7 @@ def isabspath(path):
return path[0] == '/'
def mkdir(path):
path = host(path)
if exists(path):
if not isdir(path):
raise error.general('path exists and is not a directory: %s' % (path))
@@ -111,6 +112,7 @@ def removeall(path):
def _onerror(function, path, excinfo):
print 'removeall error: (%r) %s' % (function, path)
path = host(path)
shutil.rmtree(path, onerror = _onerror)
return