diff options
author | jim <jim@38b22f21-9aea-0310-abfc-843a9883df58> | 2008-10-15 07:16:36 (GMT) |
---|---|---|
committer | jim <jim@38b22f21-9aea-0310-abfc-843a9883df58> | 2008-10-15 07:16:36 (GMT) |
commit | 5265e1118effec267aa953c68b8ef6e1cd30c18f (patch) | |
tree | 8b7060767ce0c4a6ce9af37e3ea452499140410c | |
parent | c13629af25e24a77cbc9d46a1b8781f96897aa4b (diff) |
OS X/Linux: detect filesystems that do not allow colon for linux-profile:
git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@3567 38b22f21-9aea-0310-abfc-843a9883df58
-rw-r--r-- | NEWS | 1 | ||||
-rwxr-xr-x | exe/webui/browser.py | 8 |
2 files changed, 9 insertions, 0 deletions
@@ -2,6 +2,7 @@ * Fix image gallery to allow captions containing apostrophes * Fix field IDs so that adding to a previously saved elp is consistent * Fix Common Cartridge manifest when a header image is used +* Fix OS X and Linux configDir Firefox profile on filesystem without colon * Only include a copy of GNU FDL if that is the license selected * Re-enable loading of user extended iDevices from config directory * Translation updates diff --git a/exe/webui/browser.py b/exe/webui/browser.py index 179c3a3..7465bc0 100755 --- a/exe/webui/browser.py +++ b/exe/webui/browser.py @@ -77,6 +77,14 @@ def launchBrowser(config, packageName, openMode): # workaround Debian/Ubuntu firefox launching script that requires # ':/' in the pathname profile = "linux-profile:" + # attempt to detect filesystems that won't allow a colon + try: + if (config.configDir/profile).exists(): + (config.configDir/profile).rmtree() + config.configDir/profile).mkdir() + except (OSError, IOError): + log.info("Unable to use linux-profile:") + profile = "linux-profile" if (config.configDir/profile).exists(): (config.configDir/profile).rmtree() |