[SCM] live-build branch, debian, updated. debian/3.0_a39-1-7-g030436d
Daniel Baumann
daniel at debian.org
Sun Dec 4 09:16:28 UTC 2011
The following commit has been merged in the debian branch:
commit c9a7e8b3f60f8f99f6f1b869b6e842e6c4263fb8
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 29 13:06:11 2011 +0100
Inverting logic for defaults or archive-areas wrt/ parent and derivatives.
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 3166406..3b83eed 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -597,18 +597,18 @@ Set_defaults ()
# Setting archive areas value
case "${LB_MODE}" in
progress)
- LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main}"
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
+ LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
;;
ubuntu|kubuntu)
- LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main restricted}"
- LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}"
+ LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
+ LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
;;
*)
- LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main}"
- LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}"
+ LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
+ LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
;;
esac
--
live-build
More information about the debian-live-changes
mailing list