fix for #66592

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@502 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 6c926ddd81ebc31dede6d5e64380736ea4a3fe08..09ec4b4b69a40f17e3423af77a2dc1cf1e5dd968 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.129 2004/12/17 21:18:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.130 2004/12/18 04:47:14 zhen Exp $
+
+  17 Dec 2004; John Davis <zhen@gentoo.org> modules/catalyst_support.py:
+  fix for #66592. catalyst now gives a traceback when it bails out, making
+  troubleshooting amazingly easier
 
   17 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   modules/catalyst_support.py, modules/embedded_target.py,

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 10dd2e63e3b401f7be3eff072aaf9b502ff1534d..669bc8da479fc3cb71683b9dabc869426d29632a 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.32 2004/12/17 21:18:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.33 2004/12/18 04:47:14 zhen Exp $
 
-import sys,string,os,types,re
+import sys,string,os,types,re,traceback
 
 # these should never be touched
 required_build_targets=["generic_target","generic_stage_target"]
 
 # new build types should be added here
 valid_build_targets=["stage1_target","stage2_target","stage3_target","grp_target",
-                                               "livecd_stage1_target","livecd_stage2_target","embedded_target",
-                                               "tinderbox_target","snapshot_target","netboot"]
+                       "livecd_stage1_target","livecd_stage2_target","embedded_target",
+                       "tinderbox_target","snapshot_target","netboot"]
 
 required_config_file_values=["storedir","sharedir","distdir","portdir"]
 valid_config_file_values=required_config_file_values[:]
@@ -41,6 +41,8 @@ def list_bashify(mylist):
 class CatalystError(Exception):
        def __init__(self, message):
                if message:
+                       print
+                       print traceback.print_exc(file=sys.stdout)
                        print
                        print "!!! catalyst: "+message