[Python-checkins] python/dist/src/PC/bdist_wininst install.c, 1.7, 1.8

Wed Jul 14 16:53:52 CEST 2004

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14647
Modified Files:
	install.c 
Log Message:
Don't complain that non-existant registry entries cannot be deleted.
Index: install.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** install.c	7 Jul 2004 07:34:40 -0000	1.7
--- install.c	14 Jul 2004 14:53:50 -0000	1.8
***************
*** 2170,2174 ****
 	else {
 		result = RegDeleteKey(hKey, subkeyname);
! 		if (result != ERROR_SUCCESS)
 			MessageBox(GetFocus(), string, "Could not delete key", MB_OK);
 		RegCloseKey(hKey);
--- 2170,2174 ----
 	else {
 		result = RegDeleteKey(hKey, subkeyname);
! 		if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND)
 			MessageBox(GetFocus(), string, "Could not delete key", MB_OK);
 		RegCloseKey(hKey);
***************
*** 2212,2216 ****
 	else {
 		result = RegDeleteValue(hKey, valuename);
! 		if (result != ERROR_SUCCESS)
 			MessageBox(GetFocus(), string, "Could not delete value", MB_OK);
 		RegCloseKey(hKey);
--- 2212,2216 ----
 	else {
 		result = RegDeleteValue(hKey, valuename);
! 		if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND)
 			MessageBox(GetFocus(), string, "Could not delete value", MB_OK);
 		RegCloseKey(hKey);