From d02402a147bbae945618befdb8a1a260a91ce7a6 Mon Sep 17 00:00:00 2001 From: antialias Date: Thu, 24 Jan 2013 11:39:21 -0500 Subject: changed get_username to work on buildslaves --- src/leap/base/config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/leap/base/config.py') diff --git a/src/leap/base/config.py b/src/leap/base/config.py index e235e5c3..7021cb0f 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -333,7 +333,14 @@ def validate_ip(ip_str): def get_username(): - return os.getlogin() + try: + return os.getlogin() + except OSError as e: + if e.message == "[Errno 22] Invalid argument": + import pwd + return pwd.getpwuid(os.getuid())[0] + else: + raise OSError(e.message) def get_groupname(): -- cgit v1.2.3 From 3b45b4de1183b6fd2657aef493a89e1f501e41d1 Mon Sep 17 00:00:00 2001 From: antialias Date: Thu, 24 Jan 2013 11:52:10 -0500 Subject: refine get_username to work on buildslaves --- src/leap/base/config.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/leap/base/config.py') diff --git a/src/leap/base/config.py b/src/leap/base/config.py index 7021cb0f..9583a46a 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -336,11 +336,8 @@ def get_username(): try: return os.getlogin() except OSError as e: - if e.message == "[Errno 22] Invalid argument": - import pwd - return pwd.getpwuid(os.getuid())[0] - else: - raise OSError(e.message) + import pwd + return pwd.getpwuid(os.getuid())[0] def get_groupname(): -- cgit v1.2.3 From ea00bc02d9722a670067667df752921d2c824389 Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 25 Jan 2013 07:00:10 +0900 Subject: use dirspec --- src/leap/base/config.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/leap/base/config.py') diff --git a/src/leap/base/config.py b/src/leap/base/config.py index 9583a46a..6d43a895 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -11,6 +11,7 @@ import os logger = logging.getLogger(name=__name__) from dateutil import parser as dateparser +import dirspec import requests from leap.base import exceptions @@ -279,15 +280,8 @@ def get_config_dir(): @rparam: config path @rtype: string """ - # TODO - # check for $XDG_CONFIG_HOME var? - # get a more sensible path for win/mac - # kclair: opinion? ^^ - - return os.path.expanduser( - os.path.join('~', - '.config', - 'leap')) + return os.path.join(dirspec.basedir.default_config_home, + 'leap') def get_config_file(filename, folder=None): -- cgit v1.2.3 From a1d880f201c914777daa8f416d5c25ab03e5b05d Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 25 Jan 2013 07:20:43 +0900 Subject: use dirspec for cross-platform friendly directories --- src/leap/base/config.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/leap/base/config.py') diff --git a/src/leap/base/config.py b/src/leap/base/config.py index 6d43a895..e2f0beba 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -4,6 +4,7 @@ Configuration Base Class import grp import json import logging +import re import socket import time import os @@ -11,7 +12,7 @@ import os logger = logging.getLogger(name=__name__) from dateutil import parser as dateparser -import dirspec +from dirspec import basedir import requests from leap.base import exceptions @@ -280,7 +281,12 @@ def get_config_dir(): @rparam: config path @rtype: string """ - return os.path.join(dirspec.basedir.default_config_home, + home = os.path.expanduser("~") + if re.findall("leap_tests-[a-zA-Z0-9]{6}", home): + # we're inside a test! :) + return os.path.join(home, ".config/leap") + else: + return os.path.join(basedir.default_config_home, 'leap') -- cgit v1.2.3 From e33c500ad3006670158493f2a12afc015610894d Mon Sep 17 00:00:00 2001 From: kali Date: Mon, 28 Jan 2013 04:48:21 +0900 Subject: change dirspec dep by pyxdg --- src/leap/base/config.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/leap/base/config.py') diff --git a/src/leap/base/config.py b/src/leap/base/config.py index e2f0beba..6a13db7d 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -12,7 +12,7 @@ import os logger = logging.getLogger(name=__name__) from dateutil import parser as dateparser -from dirspec import basedir +from xdg import BaseDirectory import requests from leap.base import exceptions @@ -286,7 +286,10 @@ def get_config_dir(): # we're inside a test! :) return os.path.join(home, ".config/leap") else: - return os.path.join(basedir.default_config_home, + # XXX dirspec is cross-platform, + # we should borrow some of those + # routines for osx/win and wrap this call. + return os.path.join(BaseDirectory.xdg_config_home, 'leap') -- cgit v1.2.3 From 8e5c1a50b4d6e57860a63fe5b52d56a4c205345d Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 31 Jan 2013 05:47:03 +0900 Subject: add underscore to the $HOME pattern exception --- src/leap/base/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/leap/base/config.py') diff --git a/src/leap/base/config.py b/src/leap/base/config.py index 6a13db7d..d796bcf1 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -282,7 +282,7 @@ def get_config_dir(): @rtype: string """ home = os.path.expanduser("~") - if re.findall("leap_tests-[a-zA-Z0-9]{6}", home): + if re.findall("leap_tests-[_a-zA-Z0-9]{6}", home): # we're inside a test! :) return os.path.join(home, ".config/leap") else: -- cgit v1.2.3