[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-29-gaec289a

Daniel Baumann daniel at debian.org
Tue Mar 24 21:44:06 UTC 2009


The following commit has been merged in the master branch:
commit aec289ae79214534459ec997a12566199ba55a9e
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Mar 24 22:37:34 2009 +0100

    Don't always overwrite keyring package option on debian or emedebian mode.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index d695f00..2b2e3f7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -379,11 +379,11 @@ Set_defaults ()
 	# Setting keyring packages
 	case "${LH_MODE}" in
 		debian|debian-release)
-			LH_KEYRING_PACKAGES="debian-archive-keyring"
+			LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES:-debian-archive-keyring}"
 			;;
 
 		emdebian)
-			LH_KEYRING_PACKAGES="debian-archive-keyring"
+			LH_KEYRING_PACKAGES="${LH_kEYRING_PACKAGES:-debian-archive-keyring}"
 			;;
 	esac
 

-- 
Debian Live build scripts



More information about the debian-live-changes mailing list