From aa21ac3b622e05ee797a14497105734fa1a967bf Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Wed, 14 Dec 2005 15:04:22 +0000 Subject: [PATCH] Add envscript warning to aid users who may not know what they are doing git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@968 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/generic_stage_target.py | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64943805..4a0dabd3 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.455 2005/12/13 22:52:21 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.456 2005/12/14 15:04:22 rocket Exp $ + + 14 Dec 2005; Eric Edgar + modules/generic_stage_target.py: + Add envscript warning to aid users who may not know what they are doing 13 Dec 2005; Chris Gianelloni catalyst, examples/generic_stage_template.spec: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 5d503df5..e990ea0e 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.98 2005/12/13 20:32:43 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.99 2005/12/14 15:04:22 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -782,6 +782,15 @@ class generic_stage_target(generic_target): if self.settings.has_key("ENVSCRIPT"): if not os.path.exists(self.settings["ENVSCRIPT"]): raise CatalystError, "Can't find envscript "+self.settings["ENVSCRIPT"] + + print "\nWarning!!!!" + print "\tOverriding certain env variables may cause catastrophic failure." + print "\tIf your build fails look here first as the possible problem." + print "\tCatalyst assumes you know what you are doing when setting" + print "\t\tthese variables." + print "\tCatalyst Maintainers use VERY minimal envscripts if used at all" + print "\tYou have been warned\n" + cmd("cp "+self.settings["ENVSCRIPT"]+" "+self.settings["chroot_path"]+"/tmp/envscript",\ "Could not copy envscript into place.",env=self.env) -- 2.26.2