Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Commit

Permalink
Fixed ninja bug
Browse files Browse the repository at this point in the history
  • Loading branch information
scemama committed Sep 8, 2015
1 parent a55b3cb commit d071a9e
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ from collections import namedtuple

Info = namedtuple("Info", ["url", "description", "default_path"])

path_github = {"head": "http://github.com/", "tail": "archive/master.tar.gz"}
path_github = {"head": "http://github.com", "tail": "archive/master.tar.gz"}

ocaml = Info(
url='http://raw.github.com/ocaml/opam/master/shell/opam_installer.sh',
Expand Down Expand Up @@ -180,6 +180,8 @@ def check_output(*popenargs, **kwargs):
cmd = popenargs[0]
error = subprocess.CalledProcessError(retcode, cmd)
error.output = output
# print output
# print unused_err
raise error
return output

Expand Down Expand Up @@ -224,7 +226,7 @@ def checking(d_dependency):

return a

except subprocess.CalledProcessError:
except (OSError,subprocess.CalledProcessError):
default_path = d_info[binary].default_path
if os.path.exists(default_path):
return default_path
Expand Down Expand Up @@ -341,9 +343,9 @@ _|_ | | _> |_ (_| | | (_| |_ | (_) | |
extension = splitext(url)[1]
path_archive = "Downloads/{0}{1}".format("ninja", extension)

l_cmd = ["cd install &&",
"wget {0} -O {1} -o /dev/null &&".format(url, path_archive),
"./scripts/install_ninja.sh 2> /dev/null &&", "cd -"]
l_cmd = ["set -x ;", "cd install &&",
"wget {0} -O {1} &&".format(url, path_archive),
"./scripts/install_ninja.sh &&", "cd -"]

try:
check_output(" ".join(l_cmd), shell=True)
Expand Down

0 comments on commit d071a9e

Please sign in to comment.