Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
474ae9a8
Commit
474ae9a8
authored
Jun 11, 2016
by
Davis E. King
Committed by
GitHub
Jun 11, 2016
Browse files
Merge pull request #136 from AbdealiJK/ajk/setup
setup.py: Don't fail if pip fails in cmake err msg
parents
87dff094
8da4053c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
16 deletions
+20
-16
setup.py
setup.py
+20
-16
No files found.
setup.py
View file @
474ae9a8
...
...
@@ -468,15 +468,19 @@ class build(_build):
message
=
msg_pkgmanager
.
format
(
'OSX'
,
manager
)
break
elif
sys
.
platform
.
startswith
(
'linux'
):
distname
=
None
try
:
import
distro
except
ImportError
:
except
ImportError
as
err
:
import
pip
pip_exit
=
pip
.
main
([
'install'
,
'distro'
])
pip_exit
=
pip
.
main
([
'install'
,
'-q'
,
'distro'
])
if
pip_exit
>
0
:
raise
SystemExit
(
'Pip was unable to install `distro`'
)
log
.
debug
(
"Unable to install `distro` to identify "
"the recommended command. Falling back "
"to default error message."
)
distro
=
err
else
:
import
distro
if
not
isinstance
(
distro
,
ImportError
):
distname
=
distro
.
id
()
if
distname
in
(
'debian'
,
'ubuntu'
):
message
=
msg_pkgmanager
.
format
(
...
...
Write
Preview
Markdown
is supported
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