diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-23 02:14:22 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2006-05-23 02:14:22 (GMT) |
commit | a32007ec7a87726f5ab780745382a47b07c40997 (patch) | |
tree | 9521a10dccc20b65d7253c7b50eb67985c80dfa2 | |
parent | d213eada769f337bf0f538b1d670c0ab97caec54 (diff) |
Add two env vars to set nick name and user dir
-rw-r--r-- | sugar/env.py | 11 | ||||
-rw-r--r-- | sugar/p2p/Buddy.py | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/sugar/env.py b/sugar/env.py index ffea539..82e47b1 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -6,7 +6,16 @@ except ImportError: from sugar.__installed__ import * 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): for data_dir in get_data_dirs(): diff --git a/sugar/p2p/Buddy.py b/sugar/p2p/Buddy.py index ea08c21..c98ce96 100644 --- a/sugar/p2p/Buddy.py +++ b/sugar/p2p/Buddy.py @@ -82,8 +82,10 @@ class Owner(Buddy): """Class representing the owner of this machine/instance.""" def __init__(self, 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): nick = "n00b" |