Port of revision 51902 in release25-maint to the trunk

This commit is contained in:
Ronald Oussoren 2006-09-17 18:42:53 +00:00
parent 43fd99c8f8
commit 3564c4622f
2 changed files with 3 additions and 1 deletions

View File

@ -945,6 +945,7 @@ def setIcon(filePath, icnsPath):
ref, isDirectory = Carbon.File.FSPathMakeRef(filePath) ref, isDirectory = Carbon.File.FSPathMakeRef(filePath)
if isDirectory: if isDirectory:
return
tmpPath = os.path.join(filePath, "Icon\r") tmpPath = os.path.join(filePath, "Icon\r")
if not os.path.exists(tmpPath): if not os.path.exists(tmpPath):
fp = open(tmpPath, 'w') fp = open(tmpPath, 'w')

View File

@ -123,7 +123,8 @@ def main():
makescript(GXX_SCRIPT, "g++") makescript(GXX_SCRIPT, "g++")
# Finally fix the makefile # Finally fix the makefile
rv = fix(MAKEFILE, do_apply) rv = fix(MAKEFILE, do_apply)
sys.exit(rv) #sys.exit(rv)
sys.exit(0)
if __name__ == '__main__': if __name__ == '__main__':
main() main()