[SCM] live-helper branch, debian-next, updated. debian/2.0_a15-1-31-g837533d

[Richard Nelson]

The following commit has been merged in the debian-next branch:
commit bd49510299bd12836cabbe2b7225478a842d7c28
Author: Richard Nelson <unixabg at gmail.com>
Date:   Tue Jun 22 22:52:41 2010 -0500

    LH_USERNAME expression cleanup and build output cleanup.

diff --git a/cgi/cgi b/cgi/cgi
index 3472a62..58eae9d 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -92,7 +92,7 @@ else
 	LH_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1)
 	LH_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1)
 	LH_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1)
-	LH_USERNAME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])username=[0-9,a-z,A-Z,.,-]+' | cut -f 2 -d '=' | head -n1)
+	LH_USERNAME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])username=[-0-9a-zA-Z.]+' | cut -f 2 -d '=' | head -n1)
 
 	# Advanced source options
 	LH_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1)
diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian-official/build.html
index 4759511..4d0d124 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -55,7 +55,7 @@
 	<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
 	<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
 	<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
-	<tr><td>--username: </td><td>username</td></tr>
+	<tr><td>--username: </td><td>LH_USERNAME</td></tr>
 </table>
 
 <b>Advanced source options</b>
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index d54db04..7ff57b0 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -55,7 +55,7 @@
 	<tr><td>--memtest: </td><td>LH_MEMTEST</td></tr>
 	<tr><td>--net-path: </td><td>LH_NET_ROOT_PATH</td></tr>
 	<tr><td>--net-server: </td><td>LH_NET_ROOT_SERVER</td></tr>
-	<tr><td>--username: </td><td>username</td></tr>
+	<tr><td>--username: </td><td>LH_USERNAME</td></tr>
 </table>
 
 <b>Advanced source options</b>

-- 
live-helper