From f2dbec3701d2d5381425235bd95e88654cd3ac9f Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Mon, 6 Feb 2006 11:17:58 +0000
Subject: [PATCH] Add missing envvar checks in tools/generate_di*_list scripts

---
 debian/changelog         | 1 +
 tools/generate_di+k_list | 3 +++
 tools/generate_di_list   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e9d98646..612cdc6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,6 +158,7 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
   [ Frans Pop ]
   * For etch, pick up the installation guide from the appropriate
     package in the archive rather than from the d-i area.
+  * Add missing envvar checks in tools/generate_di*_list scripts.
 
  -- Joey Hess <joeyh@debian.org>  Fri,  3 Feb 2006 14:22:51 -0500
 
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 48fe599a..7beedbeb 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -3,6 +3,9 @@
 # Generate a list of packages required for debian-installer
 # This script makes use of the following variables that need to be preset:
 # MIRROR, CODENAME, DI_CODENAME
+die "Missing \$MIRROR variable" unless $ENV{MIRROR};
+die "Missing \$CODENAME variable" unless $ENV{CODENAME};
+die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
 
 DATE=`date`
 cat > debian-installer+kernel-$DI_CODENAME << EOF
diff --git a/tools/generate_di_list b/tools/generate_di_list
index 1dd459d3..a01dbc26 100755
--- a/tools/generate_di_list
+++ b/tools/generate_di_list
@@ -4,6 +4,7 @@
 # MIRROR, DI_CODENAME, BASEDIR
 die "Missing \$MIRROR variable" unless $ENV{MIRROR};
 die "Missing \$DI_CODENAME variable" unless $ENV{DI_CODENAME};
+die "Missing \$BASEDIR variable" unless $ENV{BASEDIR};
 
 my @ARCHES=qw{alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel
               powerpc s390 sparc sh amd64};