From c874f1a77afc94b54424e1d1720d4a83722664b3 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 1 May 2006 19:31:55 +0000 Subject: [PATCH] Changed a display error from bug #131502 and rolling 2.0_rc45. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1128 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- catalyst | 4 ++-- modules/catalyst_support.py | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41852d1c..2233f1ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.613 2006/04/25 18:33:44 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.614 2006/05/01 19:31:55 wolf31o2 Exp $ + + 01 May 2006; Chris Gianelloni catalyst, + modules/catalyst_support.py: + Changed a display error from bug #131502 and rolling 2.0_rc45. 25 Apr 2006; Chris Gianelloni targets/support/create-iso.sh: diff --git a/catalyst b/catalyst index cb70012a..1bda9912 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python -OO # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.152 2006/04/20 15:17:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.153 2006/05/01 19:31:55 wolf31o2 Exp $ # Maintained in full by: # Eric Edgar @@ -11,7 +11,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0_rc44" +__version__="2.0_rc45" conf_values={} diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index 18098434..bd3bb75d 100644 --- a/modules/catalyst_support.py +++ b/modules/catalyst_support.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/catalyst_support.py,v 1.71 2006/04/25 17:10:11 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.72 2006/05/01 19:31:55 wolf31o2 Exp $ import sys,string,os,types,re,signal,traceback,time #import md5,sha @@ -637,7 +637,7 @@ def read_makeconf(mymakeconffile): myf.close() return parse_makeconf(mylines) except: - raise CatalystError, "Could not open make.conf file "+myspecfile + raise CatalystError, "Could not open make.conf file "+mymakeconffile else: makeconf={} return makeconf -- 2.26.2