Fix _u_rel_path problems in VCS._children
authorW. Trevor King <wking@drexel.edu>
Wed, 20 Jan 2010 14:06:58 +0000 (09:06 -0500)
committerW. Trevor King <wking@drexel.edu>
Wed, 20 Jan 2010 14:06:58 +0000 (09:06 -0500)
libbe/storage/vcs/arch.py
libbe/storage/vcs/base.py

index f9b01fdd10bd790797fad4a28c3abdc78d338477..74ba371cb740c711754a261cc2ac34ffd99625fd 100644 (file)
@@ -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):
index 83be287c67e7038ca4e5ed2745b949b7980c9e77..9fc43c1e462898c6697bc0283f9a0cdca8bd5345 100644 (file)
@@ -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(