summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-02-12 02:00:46 +0000
committerMike Frysinger <vapier@gentoo.org>2004-02-12 02:00:46 +0000
commit73b96fa3cc146ad843e66348380f19feab1eed8e (patch)
treeadb72b2600b608b07ed0cd8eece02319e41945ec /eclass/eutils.eclass
parentSRC_URI changed (diff)
downloadgentoo-2-73b96fa3cc146ad843e66348380f19feab1eed8e.tar.gz
gentoo-2-73b96fa3cc146ad843e66348380f19feab1eed8e.tar.bz2
gentoo-2-73b96fa3cc146ad843e66348380f19feab1eed8e.zip
fix for CD_ROOT when using multiple cds
Diffstat (limited to 'eclass/eutils.eclass')
-rw-r--r--eclass/eutils.eclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 28c829ff6ef6..c343a8398cf3 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.78 2004/02/09 17:08:44 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.79 2004/02/12 02:00:46 vapier Exp $
#
# Author: Martin Schlemmer <azarah@gentoo.org>
#
@@ -1102,6 +1102,11 @@ cdrom_load_next_cd() {
export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
local var=
+ if [ ! -z "${CD_ROOT}" ] ; then
+ einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
+ return
+ fi
+
unset CDROM_ROOT
var=CDROM_ROOTS_${CDROM_CURRENT_CD}
if [ -z "${!var}" ] ; then