[debian-edu-commits] r80679 - trunk/src/build/CD-administrator

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-14 17:44:14 +0000 (Fri, 14 Jun 2013)
New Revision: 80679

Modified:
   trunk/src/build/CD-administrator/CONF-wheezy-source-dvd.sh
Log:
Adjust build rules to see if the source build stop failing.

Modified: trunk/src/build/CD-administrator/CONF-wheezy-source-dvd.sh
===================================================================
--- trunk/src/build/CD-administrator/CONF-wheezy-source-dvd.sh	2013-06-14 17:21:39 UTC (rev 80678)
+++ trunk/src/build/CD-administrator/CONF-wheezy-source-dvd.sh	2013-06-14 17:44:14 UTC (rev 80679)
@@ -2,6 +2,17 @@
 # This file will have to be sourced where needed
 #
 
+# To prevent sourcing this file twice when using scripts to build CD images,
+# use the following code at the top of your script:
+#    CF=CONF.sh
+#    . $CF
+#    export DEBIAN_CD_CONF_SOURCED=true
+
+# Allow to prevent double sourcing of this file
+if [ "$DEBIAN_CD_CONF_SOURCED" = true ]; then
+	return 0
+fi
+
 # Unset all optional variables first to start from a clean state
 unset NONUS             || true
 unset FORCENONUSONCD1   || true
@@ -150,9 +161,9 @@
 # you can uncomment this line and edit to to point to a directory
 # containing dists/$CODENAME/local/binary-$ARCH
 # use local-mirror mirror for local
-export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/local-mirror
+#export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/local-mirror
 # use morror-link for local-test
-#export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/mirror-link
+export LOCALDEBS=$TOPDIR/debmirror/builder_temp_dir/mirror-link
 
 # If you want a <codename>-secured tree with a copy of the signed
 # Release.gpg and files listed by this Release file, then