Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Théo Giovanna
bitmask_client
Commits
c36e8627
Unverified
Commit
c36e8627
authored
Apr 17, 2016
by
Kali Kaneko
Browse files
[bug] avoid osx hanging
parent
2cb88871
Changes
2
Hide whitespace changes
Inline
Side-by-side
pkg/pyinst/bitmask.spec
View file @
c36e8627
...
...
@@ -51,6 +51,7 @@ if sys.platform.startswith("darwin"):
name
=
os
.
path
.
join
(
'dist'
,
'Bitmask.app'
),
appname
=
'Bitmask'
,
version
=
'0.9.0.alpha7'
,
# TODO get this from ../next-version.txt
version
=
'0.9.0.rc1'
,
icon
=
'pkg/osx/bitmask.icns'
,
bundle_identifier
=
'bitmask-0.9.0alpha7'
)
src/leap/bitmask/app.py
View file @
c36e8627
...
...
@@ -46,7 +46,15 @@ import os
import
platform
import
sys
import
psutil
if
platform
.
system
()
==
"Darwin"
:
# XXX please ignore pep8 complains, this needs to be executed
# early.
# We need to tune maximum number of files, due to zmq usage
# we hit the limit.
import
resource
resource
.
setrlimit
(
resource
.
RLIMIT_NOFILE
,
(
4096
,
10240
))
from
leap.bitmask
import
__version__
as
VERSION
from
leap.bitmask.backend.backend_proxy
import
BackendProxy
...
...
@@ -66,13 +74,7 @@ from leap.mail import __version__ as MAIL_VERSION
import
codecs
codecs
.
register
(
lambda
name
:
codecs
.
lookup
(
'utf-8'
)
if
name
==
'cp65001'
else
None
)
if
platform
.
system
()
==
"Darwin"
:
# We need to tune maximum number of files, due to zmq usage
# we hit the limit.
import
resource
resource
.
setrlimit
(
resource
.
RLIMIT_NOFILE
,
(
4096
,
10240
))
import
psutil
def
qt_hack_ubuntu
():
"""Export two env vars to avoid gui corruption, see #8028"""
...
...
@@ -172,8 +174,11 @@ def start_app():
}
flags
.
STANDALONE
=
opts
.
standalone
if
getattr
(
sys
,
'frozen'
,
False
):
flags
.
STANDALONE
=
True
if
platform
.
system
()
!=
'Darwin'
:
# XXX this hangs the OSX bundles.
if
getattr
(
sys
,
'frozen'
,
False
):
flags
.
STANDALONE
=
True
flags
.
OFFLINE
=
opts
.
offline
flags
.
MAIL_LOGFILE
=
opts
.
mail_log_file
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment