summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Back <fredericback@gmail.com>2006-09-27 18:18:11 +0000
committerFrederic Back <fredericback@gmail.com>2006-09-27 18:18:11 +0000
commit278d93679b4f294978f8c192237280afbb85d7d0 (patch)
treeb37c6b46e6de9f0b26b839d405e7b7b0c17da71e
parent7d8be1de55cc32f1b81b546a9a20c00c1ebca23f (diff)
* Corrected a bug
git-svn-id: file:///home/lennart/svn/public/fring/branches/c_walker@39 d0d2c35f-0a1e-0410-abeb-dabff30a67ee
-rw-r--r--src/fringlib/fringwalker.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/fringlib/fringwalker.py b/src/fringlib/fringwalker.py
index 02d2af6..e6e1707 100644
--- a/src/fringlib/fringwalker.py
+++ b/src/fringlib/fringwalker.py
@@ -186,7 +186,7 @@ class WalkThread( threading.Thread ):
d = h.next()
try:
while True:
- if self.stopsignal: return (None,None,0)
+ if self.stopsignal: return
d = h.next()
if not self.showhidden and d.name[0] == ".": continue
@@ -209,14 +209,16 @@ class WalkThread( threading.Thread ):
c += 1
if self.method == WALKER_CPP:
- sub = fringtools.build_tree(self.uri+os.sep+directory, self.showhidden)
+ path = get_local_path_from_uri(str(self.uri))+os.sep+directory
+ sub = fringtools.build_tree(path, self.showhidden)
elif self.method == WALKER_GNOMEVFS:
uri = self.uri
sub = self.build_tree_gnomevfs(uri.append_path(directory))
else:
- sub = self.build_tree_python(self.uri+os.sep+directory)
+ path = get_local_path_from_uri(str(self.uri))+os.sep+directory
+ sub = self.build_tree_python(path)
- if self.stopsignal: return None
+ if self.stopsignal: return
total += sub[2]
l.append( (directory,sub[1],sub[2]) );