[Pkg-bugzilla-commits] r121 - bugzilla/trunk/debian

[Alexis Sukrieh]

Author: sukria-guest
Date: 2005-09-12 22:34:22 +0000 (Mon, 12 Sep 2005)
New Revision: 121

Modified:
   bugzilla/trunk/debian/bugzilla.config
   bugzilla/trunk/debian/bugzilla.templates
Log:
closing 312925

Modified: bugzilla/trunk/debian/bugzilla.config
===================================================================
--- bugzilla/trunk/debian/bugzilla.config	2005-09-12 22:16:33 UTC (rev 120)
+++ bugzilla/trunk/debian/bugzilla.config	2005-09-12 22:34:22 UTC (rev 121)
@@ -140,11 +140,18 @@
 		db_endblock
 			
 		if db_go; then
+			
+			# first check that user and password aren't empty 
+			# (yes, there are such users around...)
 			db_get bugzilla/mysql_user || true
-			if [ "$RET" = "" ]; then
-				#mysql admin user could not be empty
-				#TODO have an explicative note of the error
+			user="$RET"
+			
+			db_get bugzilla/mysql_user_pwd || true
+			pass="$RET"
+			
+			if [ "$user" = "" ] || [ "$pass" = "" ]; then
 				db_reset bugzilla/mysql_user
+				db_input high bugzilla/mysql_user_couldnotbe_empty
 				continue				
 			fi
 			

Modified: bugzilla/trunk/debian/bugzilla.templates
===================================================================
--- bugzilla/trunk/debian/bugzilla.templates	2005-09-12 22:16:33 UTC (rev 120)
+++ bugzilla/trunk/debian/bugzilla.templates	2005-09-12 22:34:22 UTC (rev 121)
@@ -130,6 +130,14 @@
  Choosing "Later" means that you don't have yet a MySQL server up
  for Bugzilla. This choice will abort the installation process.
 
+Template: bugzilla/mysql_user_couldnotbe_empty
+Type: note
+_Description: Invalid values for MySQL access.
+ You filled bad values either for the MySQL user or for its password.
+ .
+ Empty values are not allowed for those fields, choose a correct 
+ username and password.
+
 Template: bugzilla/bugzilla_installation_way
 Type: select
 __Choices: Automatic, Manual, Later