pg_upgrade old cluster delete script

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
new file mode 100644
index a7d4a68..0be90ae
*** a/contrib/pg_upgrade/check.c
--- b/contrib/pg_upgrade/check.c
*************** output_completion_banner(char *analyze_s
*** 246,255 ****
  		"by pg_upgrade so, once you start the new server, consider running:\n"
  			   "    %s\n\n", analyze_script_file_name);
  
! 	pg_log(PG_REPORT,
! 		   "Running this script will delete the old cluster's data files:\n"
! 		   "    %s\n",
! 		   deletion_script_file_name);
  }
  
  
--- 246,262 ----
  		"by pg_upgrade so, once you start the new server, consider running:\n"
  			   "    %s\n\n", analyze_script_file_name);
  
! 
! 	if (deletion_script_file_name)
! 		pg_log(PG_REPORT,
! 			   "Running this script will delete the old cluster's data files:\n"
! 			   "    %s\n",
! 			   deletion_script_file_name);
! 	else
! 		pg_log(PG_REPORT,
! 			   "Could not create a script to delete the old cluster's data files\n"
! 			   "because user-defined tablespaces exist in the old cluster directory.\n"
! 			   "The old cluster's contents must be deleted manually.\n");
  }
  
  
*************** create_script_for_old_cluster_deletion(c
*** 585,590 ****
--- 592,609 ----
  	FILE	   *script = NULL;
  	int			tblnum;
  
+ 	/*
+ 	 *	Some users (oddly) create tablespaces inside the cluster data
+ 	 *	directory.  We can't create a proper old cluster delete script
+ 	 *	in that case.
+ 	 */
+ 	for (tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++)
+ 	{
+ 		if (strncmp(os_info.old_tablespaces[tblnum], old_cluster.pgdata,
+ 			strlen(old_cluster.pgdata)) == 0)
+ 			return;
+ 	}
+ 
  	*deletion_script_file_name = pg_malloc(MAXPGPATH);
  
  	prep_status("Creating script to delete old cluster");