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

Richard Nelson unixabg at gmail.com
Wed Jun 23 03:59:59 UTC 2010


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

    LH_ENCRYPTION expression cleanup.

diff --git a/cgi/cgi b/cgi/cgi
index 5c68400..eb94ffc 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -82,7 +82,7 @@ else
 	LH_BOOTAPPEND=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1)
 	LH_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1)
 	LH_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1)
-	LH_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9,a-z,A-Z]+' | cut -f 2 -d '=' | head -n1)
+	LH_ENCRYPTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])encryption=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
 	LH_HOSTNAME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])hostname=[0-9,a-z,A-Z,.,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[0-9,a-z,A-Z,., ,~,;,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[0-9,a-z,A-Z,., ,~,;,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)

-- 
live-helper



More information about the debian-live-changes mailing list