From 278d93679b4f294978f8c192237280afbb85d7d0 Mon Sep 17 00:00:00 2001 From: Frederic Back Date: Wed, 27 Sep 2006 18:18:11 +0000 Subject: * Corrected a bug git-svn-id: file:///home/lennart/svn/public/fring/branches/c_walker@39 d0d2c35f-0a1e-0410-abeb-dabff30a67ee --- src/fringlib/fringwalker.py | 10 ++++++---- 1 file 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]) ); -- cgit