--- wadf-reprocess.orig	2008-09-01 09:52:18.000000000 +0100
+++ wadf-reprocess	2008-09-01 10:17:16.000000000 +0100
@@ -85,15 +85,6 @@
 		exit(5);
 }
 
-echo "Do you want to redeploy database(s)? This will ERASE the existing databases (y/n) [default=n]:\n";
-$db_redeploy = strtolower(trim(fgets(STDIN)));
-
-if ($db_redeploy == 'y') {
-	$db_redeploy = true;
-} else {
-	$db_redeploy = false;
-}
-
 $macros = null;
 if ($current_dir) {
 	$macros['deploy_path'] = getcwd();
@@ -105,6 +96,29 @@
 }
 $dir = $WebDeploy->resolveMacro('deploy_path');
 
+$in_use = $WebDeploy->enumerateMultipleEntities();
+$dbs = array(); 
+if (isset($in_use['db'])) {
+	foreach ($in_use['db'] as $num) {
+		$host = $WebDeploy->resolveMacro("db${num}_host");
+		$name = $WebDeploy->resolveMacro("db${num}_name");
+		if ($host == 'localhost') {
+			$dbs[] = "\"$name\"";
+		} else {
+			$dbs[] = "\"$name.$host\"";
+		}
+	}
+}
+echo "Do you want to redeploy ".(count($dbs)>1?'databases':'the database')."? This will ERASE the existing database".(count($dbs)>1?'s':'').' '.implode(', ', $dbs)." (y/n) [default=n]:\n";
+$db_redeploy = strtolower(trim(fgets(STDIN)));
+
+if ($db_redeploy == 'y') {
+	$db_redeploy = true;
+} else {
+	$db_redeploy = false;
+}
+
+
 
 if ($dir == '@deploy_path@') {
 	print "ERROR: resolving deploy_path failed\n";

--- WADF.php.orig	2008-09-01 09:49:54.000000000 +0100
+++ WADF.php	2008-09-01 11:04:38.000000000 +0100
@@ -203,7 +203,7 @@
 		exec($cmd);
 	}
 	
-	protected function _enumerateMultipleEntities()
+	public function enumerateMultipleEntities()
 	{
 		$dir = $this->resolveMacro('deploy_path');
 	
@@ -229,7 +229,7 @@
 	
 	public function deployDatabase()
 	{
-		$in_use = $this->_enumerateMultipleEntities();
+		$in_use = $this->enumerateMultipleEntities();
 		$dir = $this->resolveMacro('deploy_path');
 		
 		// deploy database
@@ -286,7 +286,7 @@
 	
 	public function undeployDatabase()
 	{
-		$in_use = $this->_enumerateMultipleEntities();
+		$in_use = $this->enumerateMultipleEntities();
 		if (isset($in_use['db'])) {
 			foreach ($in_use['db'] as $num) {
 				$host = $this->resolveMacro("db${num}_host");
@@ -357,7 +357,7 @@
 			return;
 		}
 
-		$in_use = $this->_enumerateMultipleEntities();
+		$in_use = $this->enumerateMultipleEntities();
 		if (isset($in_use['vhost'])) {
 			foreach ($in_use['vhost'] as $vhost_id) {
 				$hosts[] = $this->resolveMacro("vhost${vhost_id}_name");