summaryrefslogtreecommitdiffstats
path: root/combox/file.py
diff options
context:
space:
mode:
Diffstat (limited to 'combox/file.py')
-rw-r--r--combox/file.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/combox/file.py b/combox/file.py
index 2f18823..81d15fe 100644
--- a/combox/file.py
+++ b/combox/file.py
@@ -41,10 +41,17 @@ def relative_path(p, config, comboxd=True):
combox.
"""
+ directory = None
if comboxd:
directory = '%s/' % config['combox_dir']
else:
- directory = '%s/' % get_nodedirs(config)[0]
+ for node in get_nodedirs(config):
+ if p.startswith(node):
+ directory = '%s/' % node
+
+ if directory is None:
+ err_msg = "invalid path %s" % p
+ raise ValueError, err_msg
return p.partition(directory)[2]