gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tar_required logic

Browse Source 
If all requirements were satisfied, tar_required would always be false.
This commit fixes it.
This commit is contained in:
Pratyush Das 2020-04-27 19:04:54 +05:30 committed by jenkins
parent 87011bd783
commit f8ccd27e67
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/packaging/cpt.py
View File

@ -2092,6 +2092,9 @@ elif args['with_binary_llvm'] is False and args['with_llvm_url']:
else:
LLVM_GIT_URL = "http://root.cern.ch/git/llvm.git"
if args['with_llvm_tar']:
tar_required = True
if args['check_requirements']:
llvm_binary_name = ""
box_draw('Check availability of required softwares')
@ -2140,18 +2143,15 @@ if args['check_requirements']:
else:
choice = custom_input("Please respond with 'yes' or 'no': ", args['y'])
continue
if no_install is False and llvm_binary_name != "":
if args["with_llvm_tar"]:
if no_install is False and llvm_binary_name != "" and tar_required is False:
try:
subprocess.Popen(['sudo apt-get install llvm-{0}-dev'.format(llvm_vers)],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
except:
tar_required = True
else:
try:
subprocess.Popen(['sudo apt-get install llvm-{0}-dev'.format(llvm_vers)],
shell=True,
stdin=subprocess.PIPE,
stdout=None,
stderr=subprocess.STDOUT).communicate('yes'.encode('utf-8'))
except:
tar_required = True
elif OS == 'Windows':
check_win('git')