From: <nem...@us...> - 2008-03-07 19:21:13
|
Revision: 8274 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8274&view=rev Author: nemostultae Date: 2008-03-07 11:21:14 -0800 (Fri, 07 Mar 2008) Log Message: ----------- Fixed bug which caused first build to forever hang when sorting resources. We were using absolute paths--not relative. Thus: >>> os.path.split("/foo") ('/', 'foo') caused an infinite loop, and the expected result: >>> os.path.split("foo") ('', 'foo') would not cause an infinite loop... Modified Paths: -------------- armagetronad/trunk/armagetronad/batch/make/sortresources.py Modified: armagetronad/trunk/armagetronad/batch/make/sortresources.py =================================================================== --- armagetronad/trunk/armagetronad/batch/make/sortresources.py 2008-03-07 13:20:40 UTC (rev 8273) +++ armagetronad/trunk/armagetronad/batch/make/sortresources.py 2008-03-07 19:21:14 UTC (rev 8274) @@ -66,10 +66,12 @@ self.data.type = string.split(sysid,"-")[0] # look in current and parent directories for dtds - while len(path) > 0: + while len(path) > 0 and path != "/": fullfile = os.path.join(path, sysid) - try: return open( fullfile ) - except: pass + try: + return open( fullfile ) + except: + pass # go to "parent" directory path = os.path.split(path)[0] @@ -114,9 +116,9 @@ # scan for all XML files in the directory and rename them according to the rules def scanDir(sourceDir, destinationDir, function): def visitor( arg, dirname, names ): - for file in names: - if len(file) > 4 and file[-4:] == ".xml": - path = os.path.join(dirname,file) + for filename in names: + if filename.endswith(".xml"): + path = os.path.join(dirname, filename) newPath = getCanonicalPath(path) # call the passed function function(path, os.path.join(destinationDir, newPath), newPath) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |