v.licheni.net
/
stack
/
code
/
dboxswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
accomodate new linux dropbox dir path instance1
[stack/code/dboxswitch.git]
/
dboxswitch
/
profhandler.py
diff --git
a/dboxswitch/profhandler.py
b/dboxswitch/profhandler.py
index
f2be538
..
8802f1f
100644
(file)
--- a/
dboxswitch/profhandler.py
+++ b/
dboxswitch/profhandler.py
@@
-159,7
+159,11
@@
class ProfHandler():
def getDropboxDirectory(self):
pl = platform.system()
if pl in ('Linux', 'Darwin'):
def getDropboxDirectory(self):
pl = platform.system()
if pl in ('Linux', 'Darwin'):
- return os.path.join(os.path.expanduser('~'),".dropbox")
+ basepath = os.path.join(os.path.expanduser("~"), ".dropbox")
+ for path in [os.path.join(basepath, "instance1"), basepath]:
+ if os.path.exists(path):
+ return path
+ raise NotImplementedError("Path not found " + basepath + "[instance1]")
elif pl == 'Windows':
assert os.environ.has_key('APPDATA'), Exception('APPDATA env variable not found')
return os.path.join(os.environ['APPDATA'],'Dropbox')
elif pl == 'Windows':
assert os.environ.has_key('APPDATA'), Exception('APPDATA env variable not found')
return os.path.join(os.environ['APPDATA'],'Dropbox')