sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add two env vars to set nick name and user dir

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-05-22 22:14:22 -04:00
parent d213eada76
commit a32007ec7a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sugar/env.py
View File

@ -6,7 +6,16 @@ except ImportError:
from sugar.__installed__ import * from sugar.__installed__ import *
def get_user_dir(): def get_user_dir():
return os.path.expanduser('~/.sugar/') if os.environ.has_key('SUGAR_USER_DIR'):
return os.environ['SUGAR_USER_DIR']
else:
return os.path.expanduser('~/.sugar/')
def get_nick_name():
if os.environ.has_key('SUGAR_NICK_NAME'):
return os.environ['SUGAR_NICK_NAME']
else:
return None
def get_data_file(filename): def get_data_file(filename):
for data_dir in get_data_dirs(): for data_dir in get_data_dirs():

6
sugar/p2p/Buddy.py
View File

@ -82,8 +82,10 @@ class Owner(Buddy):
"""Class representing the owner of this machine/instance.""" """Class representing the owner of this machine/instance."""
def __init__(self, group): def __init__(self, group):
self._group = group self._group = group
nick = pwd.getpwuid(os.getuid())[0] nick = env.get_nick_name()
if not nick:
nick = pwd.getpwuid(os.getuid())[0]
if not nick or not len(nick): if not nick or not len(nick):
nick = "n00b" nick = "n00b"