aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Bentley <abentley@panoramicfeedback.com>2005-05-18 18:37:17 +0000
committerAaron Bentley <abentley@panoramicfeedback.com>2005-05-18 18:37:17 +0000
commit53f5cced06f25dc49cedf1a3fb181201b727a521 (patch)
tree17283c382777c33216bb2d533a1bc72dfb80cc01
parent52ba04aec5b23244aa2c15ab666024d7b9e0015f (diff)
downloadbugseverywhere-53f5cced06f25dc49cedf1a3fb181201b727a521.tar.gz
Normalized paths before use in rel_filename
-rw-r--r--becommands/set_root.py4
-rw-r--r--libbe/arch.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/becommands/set_root.py b/becommands/set_root.py
index ad20b8e..14286e0 100644
--- a/becommands/set_root.py
+++ b/becommands/set_root.py
@@ -20,6 +20,7 @@ from libbe import bugdir, cmdutil, rcs
def execute(args):
"""
>>> from libbe import tests
+ >>> import os
>>> dir = tests.Dir()
>>> try:
... bugdir.tree_root(dir.name)
@@ -32,7 +33,8 @@ def execute(args):
>>> bd = bugdir.tree_root(dir.name)
>>> bd.root = dir.name
>>> dir = tests.arch_dir()
- >>> execute([dir.name])
+ >>> os.chdir(dir.name)
+ >>> execute('.')
Using Arch for revision control.
Directory initialized.
>>> bd = bugdir.tree_root(dir.name+"/{arch}")
diff --git a/libbe/arch.py b/libbe/arch.py
index 55daed0..e2d867f 100644
--- a/libbe/arch.py
+++ b/libbe/arch.py
@@ -74,6 +74,8 @@ def tree_root(filename):
return invoke_client("tree-root", dirname).rstrip('\n')
def rel_filename(filename, root):
+ filename = os.path.realpath(filename)
+ root = os.path.realpath(root)
assert(filename.startswith(root))
return filename[len(root)+1:]