From 4437e500b4ad6bf7c007d8207928b3b1b0c01d3c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 20 Jan 2010 09:06:58 -0500 Subject: [PATCH] Fix _u_rel_path problems in VCS._children --- libbe/storage/vcs/arch.py | 1 - libbe/storage/vcs/base.py | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libbe/storage/vcs/arch.py b/libbe/storage/vcs/arch.py index f9b01fd..74ba371 100644 --- a/libbe/storage/vcs/arch.py +++ b/libbe/storage/vcs/arch.py @@ -304,7 +304,6 @@ class Arch(base.VCS): self._invoke_client( 'file-find', '--unescaped', path, revision) relpath = output.rstrip('\n').splitlines()[-1] - print >> sys.stderr, 'getting', relpath return base.VCS._vcs_get_file_contents(self, relpath) def _vcs_path(self, id, revision): diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py index 83be287..9fc43c1 100644 --- a/libbe/storage/vcs/base.py +++ b/libbe/storage/vcs/base.py @@ -749,7 +749,8 @@ os.listdir(self.get_path("bugs")): if revision == None: id_to_path = self._cached_path_id.path else: - id_to_path = lambda id : self._vcs_path(id, revision) + id_to_path = lambda id : os.path.join( + self.repo, self._vcs_path(id, revision)) if id==None: path = self.be_dir else: @@ -772,7 +773,8 @@ os.listdir(self.get_path("bugs")): isdir = os.path.isdir listdir = os.listdir else: - id_to_path = lambda id : self._vcs_path(id, revision) + id_to_path = lambda id : os.path.join( + self.repo, self._vcs_path(id, revision)) isdir = lambda path : self._vcs_isdir( self._u_rel_path(path), revision) listdir = lambda path : self._vcs_listdir( -- 2.26.2