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

Error while initiating .sugar environment #1327

Browse Source
This commit is contained in:
Aleksey Lim 2009-09-16 16:44:42 +00:00
parent df89c1bf0b
commit f939baec05
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sugar/profile.py
View File

@ -53,6 +53,9 @@ class Profile(object):
self._pubkey = None self._pubkey = None
self._privkey_hash = None self._privkey_hash = None
self.pubkey = self._load_pubkey()
self.privkey_hash = self._hash_private_key()
def is_valid(self): def is_valid(self):
client = gconf.client_get_default() client = gconf.client_get_default()
nick = client.get_string("/desktop/sugar/user/nick") nick = client.get_string("/desktop/sugar/user/nick")
@ -65,6 +68,10 @@ class Profile(object):
def _load_pubkey(self): def _load_pubkey(self):
key_path = os.path.join(env.get_profile_path(), 'owner.key.pub') key_path = os.path.join(env.get_profile_path(), 'owner.key.pub')
if not os.path.exists(key_path):
return None
try: try:
f = open(key_path, "r") f = open(key_path, "r")
lines = f.readlines() lines = f.readlines()
@ -83,14 +90,12 @@ class Profile(object):
logging.error("Error parsing public key.") logging.error("Error parsing public key.")
return None return None
def _get_pubkey(self):
# load on-demand.
if not self._pubkey:
self._pubkey = self._load_pubkey()
return self._pubkey
def _hash_private_key(self): def _hash_private_key(self):
key_path = os.path.join(env.get_profile_path(), 'owner.key') key_path = os.path.join(env.get_profile_path(), 'owner.key')
if not os.path.exists(key_path):
return None
try: try:
f = open(key_path, "r") f = open(key_path, "r")
lines = f.readlines() lines = f.readlines()
@ -115,15 +120,6 @@ class Profile(object):
key_hash = util.sha_data(key) key_hash = util.sha_data(key)
return util.printable_hash(key_hash) return util.printable_hash(key_hash)
def _get_privkey_hash(self):
# load on-demand.
if not self._privkey_hash:
self._privkey_hash = self._hash_private_key()
return self._privkey_hash
privkey_hash = property(_get_privkey_hash)
pubkey = property(_get_pubkey)
def convert_profile(self): def convert_profile(self):
cp = ConfigParser() cp = ConfigParser()
path = os.path.join(env.get_profile_path(), 'config') path = os.path.join(env.get_profile_path(), 'config')