@@ -487,7 +487,7 @@ def xit(msg, status=-1):
487
487
exit (- 1 )
488
488
489
489
490
- def _install_from_url (url , patch = None , extra_opts = [], add_cflags = "" ):
490
+ def _install_from_url (url , patch = None , extra_opts = [], add_cflags = "" , ignore_errors = False ):
491
491
name = url [url .rfind ("/" )+ 1 :]
492
492
tempdir = tempfile .mkdtemp ()
493
493
@@ -526,11 +526,11 @@ def _install_from_url(url, patch=None, extra_opts=[], add_cflags=""):
526
526
else :
527
527
user_arg = ""
528
528
status = system ("cd %s/%s; %s %s %s setup.py install %s %s" % (tempdir , bare_name , 'CFLAGS="%s"' % cflags if cflags else "" , 'CPPFLAGS="%s"' % cppflags if cppflags else "" , sys .executable , user_arg , " " .join (extra_opts )))
529
- if status != 0 :
529
+ if status != 0 and not ignore_errors :
530
530
xit ("An error occurred trying to run `setup.py install %s %s'" % (user_arg , " " .join (extra_opts )))
531
531
532
532
533
- def install_from_pypi (package , patch = None , extra_opts = [], add_cflags = "" ):
533
+ def install_from_pypi (package , patch = None , extra_opts = [], add_cflags = "" , ignore_errors = True ):
534
534
package_pattern = os .environ .get ("GINSTALL_PACKAGE_PATTERN" , "https://pypi.org/pypi/%s/json" )
535
535
package_version_pattern = os .environ .get ("GINSTALL_PACKAGE_VERSION_PATTERN" , "https://pypi.org/pypi/%s/%s/json" )
536
536
@@ -556,7 +556,7 @@ def install_from_pypi(package, patch=None, extra_opts=[], add_cflags=""):
556
556
break
557
557
558
558
if url :
559
- _install_from_url (url , patch = patch , extra_opts = extra_opts , add_cflags = add_cflags )
559
+ _install_from_url (url , patch = patch , extra_opts = extra_opts , add_cflags = add_cflags , ignore_errors = ignore_errors )
560
560
else :
561
561
xit ("Package not found: '%s'" % package )
562
562
@@ -647,7 +647,7 @@ def main(argv):
647
647
KNOWN_PACKAGES [pkg ]()
648
648
elif args .command == "pypi" :
649
649
for pkg in args .package .split ("," ):
650
- install_from_pypi (pkg )
650
+ install_from_pypi (pkg , ignore_errors = False )
651
651
652
652
653
653
0 commit comments