diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-27 12:12:28 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-27 12:12:28 -0300 |
| commit | 700e70786553dfe39490e843d9e26711c2cc9bc3 (patch) | |
| tree | 539ea113af94932105adb8dc02ed765a220907b4 /src/leap/bitmask | |
| parent | 99b5facaa9c69386ebe15f0c1bf3d0e18ae68af5 (diff) | |
| parent | 721aa952da943cf3e1ffd3a2a4d1d9a92ee51312 (diff) | |
Merge remote-tracking branch 'kali/bug/minor-fixes-packaging' into develop
Diffstat (limited to 'src/leap/bitmask')
| -rw-r--r-- | src/leap/bitmask/platform_init/locks.py | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/util/requirement_checker.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/leap/bitmask/platform_init/locks.py b/src/leap/bitmask/platform_init/locks.py index ecfe3b1f..34f884dc 100644 --- a/src/leap/bitmask/platform_init/locks.py +++ b/src/leap/bitmask/platform_init/locks.py @@ -185,7 +185,7 @@ if platform_init.IS_WIN: Creates a lock based on the atomic nature of mkdir on Windows system calls. """ - LOCKBASE = os.path.join(gettempdir(), "leap-client-lock") + LOCKBASE = os.path.join(gettempdir(), "bitmask-lock") def __init__(self): """ @@ -353,7 +353,7 @@ def we_are_the_one_and_only(): _sys = platform.system() if _sys in ("Linux", "Darwin"): - locker = UnixLock('/tmp/leap-client.lock') + locker = UnixLock('/tmp/bitmask.lock') locker.get_lock() we_are_the_one = locker.locked_by_us if not we_are_the_one: diff --git a/src/leap/bitmask/util/requirement_checker.py b/src/leap/bitmask/util/requirement_checker.py index 1d9b9923..bd3c1412 100644 --- a/src/leap/bitmask/util/requirement_checker.py +++ b/src/leap/bitmask/util/requirement_checker.py @@ -51,8 +51,9 @@ def get_requirements(): # if we are running from the package if not develop: - requires_file_name = os.path.join('leap', 'util', 'reqs.txt') - dist_name = Requirement.parse('leap-client') + requires_file_name = os.path.join( + 'leap', 'bitmask', 'util', 'reqs.txt') + dist_name = Requirement.parse('bitmask') try: with resource_stream(dist_name, requires_file_name) as stream: |