[check] Fix

Use get_programUninstalls from base
This commit is contained in:
Alexander Trofimov
2020-10-08 11:17:11 +03:00
parent 0bca656f0c
commit 2a8bbe7b86
2 changed files with 2 additions and 24 deletions

View File

@ -219,29 +219,6 @@ def check_buildTools():
return dependence
def get_programDelInfoByFlag(sName, flag):
info = []
aReg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
aKey= winreg.OpenKey(aReg, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, winreg.KEY_READ | flag)
count_subkey = winreg.QueryInfoKey(aKey)[0]
for i in range(count_subkey):
try:
asubkey_name = winreg.EnumKey(aKey, i)
asubkey = winreg.OpenKey(aKey, asubkey_name)
progName = winreg.QueryValueEx(asubkey, 'DisplayName')[0]
if (progName.find(sName) != -1):
info.append(winreg.QueryValueEx(asubkey, 'UninstallString')[0])
except:
pass
return info
def get_programDelInfo(sName):
return get_programDelInfoByFlag(sName, winreg.KEY_WOW64_32KEY) + get_programDelInfoByFlag(sName, winreg.KEY_WOW64_64KEY)
def check_dependencies():
final_dependence = CDependencies()

View File

@ -2,6 +2,7 @@ import sys
sys.path.append('../build_tools/scripts')
import os
import base
import dependence
import subprocess
import ctypes
import checks_develop as check
@ -125,7 +126,7 @@ def installingProgram(sProgram, sParam = ''):
def deleteProgram(sName):
print("Deleting " + sName + "...")
delInfo = check.get_programDelInfo(sName)
delInfo = dependence.get_programUninstalls(sName)
for info in delInfo:
if (base.is_file(info) == False):