From: Eric Edgar Date: Thu, 13 Oct 2005 17:13:35 +0000 (+0000) Subject: Print a warning if livecd/iso is not defined X-Git-Tag: CATALYST_2_0_6_916~633 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba67b9db262625869512e6170446f83e95899bd0;p=catalyst.git Print a warning if livecd/iso is not defined git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@861 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 00488165..fa304e23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.353 2005/10/11 22:26:17 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.354 2005/10/13 17:13:35 rocket Exp $ + + 13 Oct 2005; Eric Edgar + modules/generic_stage_target.py: + Print a warning if livecd/iso is not defined 11 Oct 2005; Chris Gianelloni arch/x86.py: Reverted default CHOST for x86 back to i386-pc-linux-gnu. diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 88833757..e488bdf9 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.65 2005/10/10 20:38:03 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.66 2005/10/13 17:13:35 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -964,6 +964,10 @@ class generic_stage_target(generic_target): cmd("/bin/bash "+self.settings["controller_file"]+" iso "+\ self.settings["iso"],"ISO creation script failed.") touch(self.settings["autoresume_path"]+"create_iso") + else: + print "WARNING livecd/iso was not defined." + print "A CD Image will not be created, skipping create-iso.sh..." + def build_packages(self): if self.settings.has_key("AUTORESUME") \