[Python-checkins] python/dist/src/PC/bdist_wininst install.c, 1.1.14.2, 1.1.14.3

[theller at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15066

Modified Files:
      Tag: release23-maint
	install.c 
Log Message:
Don't complain that non-existant registry entries cannot be deleted.

Backported from trunk.


Index: install.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v
retrieving revision 1.1.14.2
retrieving revision 1.1.14.3
diff -C2 -d -r1.1.14.2 -r1.1.14.3
*** install.c	2 Jul 2004 07:54:30 -0000	1.1.14.2
--- install.c	14 Jul 2004 14:56:11 -0000	1.1.14.3
***************
*** 1983,1987 ****
  	else {
  		result = RegDeleteKey(hKey, subkeyname);
! 		if (result != ERROR_SUCCESS)
  			MessageBox(GetFocus(), string, "Could not delete key", MB_OK);
  		RegCloseKey(hKey);
--- 1983,1987 ----
  	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);
***************
*** 2025,2029 ****
  	else {
  		result = RegDeleteValue(hKey, valuename);
! 		if (result != ERROR_SUCCESS)
  			MessageBox(GetFocus(), string, "Could not delete value", MB_OK);
  		RegCloseKey(hKey);
--- 2025,2029 ----
  	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);