[SCM] live-helper branch, debian, updated. debian/2.0_a8-1-36-ga44b663

Daniel Baumann daniel at debian.org
Fri Mar 12 15:25:13 UTC 2010 

The following commit has been merged in the debian branch:
commit 4e30d10c93949e18bf37125dbf01e8dba762e0f9
Author: Richard Nelson <unixabg at gmail.com>
Date:   Mon Mar 8 10:53:56 2010 -0600

    Removing LH_MIRROR_BOOTSTRAP_SECURITY in the cgi.

diff --git a/cgi/cgi b/cgi/cgi
index 044886c..2cbb56c 100755
--- a/cgi/cgi
+++ b/cgi/cgi
@@ -27,8 +27,7 @@ cat "${_TEMPLATES}"/header.html
 if [ -z "${QUERY_STRING}" ]
 then
 	# Sending html form
-	sed -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \
-	    -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
+	sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
 	    -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
 	    -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
 	    -e "s/VERSION/${VERSION}/" \
@@ -60,7 +59,6 @@ else
 	LH_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architecture=[0-9,a-z]+' | cut -f 2 -d '=' | head -n1)
 	LH_BOOTSTRAP_FLAVOUR=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootstrap_flavour=[a-z]+' | cut -f 2 -d '=' | head -n1)
 	LH_MIRROR_BOOTSTRAP=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
-	LH_MIRROR_BOOTSTRAP_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_bootstrap=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_MIRROR_BINARY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_MIRROR_BINARY_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])mirror_binary_security=[0-9,a-z,A-Z,.,~,:,/,_,-]+' | cut -f 2 -d '=' | head -n1)
 	LH_SECTIONS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])sections=[a-z]+' | cut -f 2 -d '=' | head -n1)
@@ -103,8 +101,7 @@ else
 	then
 		echo "<h2><div style='color: red;'>Error: No email address specified.</div></h2>"
 
-		sed -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \
-		    -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
+		sed -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
 		    -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
 		    -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
 		    -e "s/VERSION/${VERSION}/" \
@@ -128,7 +125,6 @@ else
 	    -e "s/LH_PACKAGES/${LH_PACKAGES}/" \
 	    -e "s/LH_ARCHITECTURE/${LH_ARCHITECTURE}/" \
 	    -e "s/LH_BOOTSTRAP_FLAVOUR/${LH_BOOTSTRAP_FLAVOUR}/" \
-	    -e "s#LH_MIRROR_BOOTSTRAP_SECURITY#${LH_MIRROR_BOOTSTRAP_SECURITY}#" \
 	    -e "s#LH_MIRROR_BOOTSTRAP#${LH_MIRROR_BOOTSTRAP}#" \
 	    -e "s#LH_MIRROR_BINARY_SECURITY#${LH_MIRROR_BINARY_SECURITY}#" \
 	    -e "s#LH_MIRROR_BINARY#${LH_MIRROR_BINARY}#" \
@@ -178,7 +174,6 @@ LH_PACKAGES="${LH_PACKAGES}"
 
 # Advanced bootstrap options
 LH_ARCHITECTURE="${LH_ARCHITECTURE}"
-LH_MIRROR_BOOTSTRAP_SECURITY="${LH_MIRROR_BOOTSTRAP}"
 LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
 LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
 LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
diff --git a/cgi/default b/cgi/default
index 8e08435..41c76ef 100644
--- a/cgi/default
+++ b/cgi/default
@@ -11,7 +11,6 @@ _TEMPLATES="/usr/share/live-helper/templates/cgi/${_MODE}"
 _TEMPDIR="/srv/debian-live/build/tmp"
 
 LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-LH_MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
 LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian-official/build.html
index f03df68..72e2a9b 100644
--- a/templates/cgi/debian-official/build.html
+++ b/templates/cgi/debian-official/build.html
@@ -29,7 +29,6 @@
 	<tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
 	<tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
 	<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
-	<tr><td>--mirror-bootstrap-security: </td><td>LH_MIRROR_BOOTSTRAP_SECURITY</td></tr>
 	<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
 	<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
 	<tr><td>--sections: </td><td>LH_SECTIONS</td></tr>
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index b523e99..2a86d25 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -112,10 +112,6 @@
 			<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
 		</tr>
 		<tr>
-			<td><label for="Mirror_Bootstrap_Security">--mirror-bootstrap-security:</label> </td>
-			<td><input id="Mirror_Bootstrap_Security" name="mirror_bootstrap_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP_SECURITY" readonly /></td>
-		</tr>
-		<tr>
 			<td><label for="Mirror_Binary">--mirror-binary:</label> </td>
 			<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" readonly /></td>
 		</tr>
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
index 19bc255..5a2c24d 100644
--- a/templates/cgi/debian-unofficial/build.html
+++ b/templates/cgi/debian-unofficial/build.html
@@ -29,7 +29,6 @@
 	<tr><td>--architecture: </td><td>LH_ARCHITECTURE</td></tr>
 	<tr><td>--bootstrap-flavour: </td><td>LH_BOOTSTRAP_FLAVOUR</td></tr>
 	<tr><td>--mirror-bootstrap: </td><td>LH_MIRROR_BOOTSTRAP</td></tr>
-	<tr><td>--mirror-bootstrap-security: </td><td>LH_MIRROR_BOOTSTRAP_SECURITY</td></tr>
 	<tr><td>--mirror-binary: </td><td>LH_MIRROR_BINARY</td></tr>
 	<tr><td>--mirror-binary-security: </td><td>LH_MIRROR_BINARY_SECURITY</td></tr>
 	<tr><td>--sections: </td><td>LH_SECTIONS</td></tr>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index ffd6db6..c9dcb17 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -112,10 +112,6 @@
 			<td><input id="Mirror_Bootstrap" name="mirror_bootstrap" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP" readonly /></td>
 		</tr>
 		<tr>
-			<td><label for="Mirror_Bootstrap_Security">--mirror-bootstrap-security:</label> </td>
-			<td><input id="Mirror_Bootstrap_Security" name="mirror_bootstrap_security" maxlength="256" size="50" type="text" value="LH_MIRROR_BOOTSTRAP_SECURITY" readonly /></td>
-		</tr>
-		<tr>
 			<td><label for="Mirror_Binary">--mirror-binary:</label> </td>
 			<td><input id="Mirror_Binary" name="mirror_binary" maxlength="256" size="50" type="text" value="LH_MIRROR_BINARY" readonly /></td>
 		</tr>

-- 
live-helper

More information about the debian-live-changes mailing list