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

diff --git a/ChangeLog b/ChangeLog
index 41852d1c70698152e2237309ae49be4ec400c7bf..2233f1ee8d1ee9f73e614b88c7e08d1dcead26d8 100644 (file)
--- 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 <wolf31o2@gentoo.org> catalyst,
+  modules/catalyst_support.py:
+  Changed a display error from bug #131502 and rolling 2.0_rc45.
 
   25 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/create-iso.sh:

diff --git a/catalyst b/catalyst
index cb70012afef74226af5384ebd43663a268f4c1fa..1bda99127b4f53c9b1f724b1d3856904a433c0fd 100755 (executable)
--- 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 <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc44"
+__version__="2.0_rc45"
 
 conf_values={}
 

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 18098434525ce0ad0a6389b7cace92061978f6d4..bd3bb75d4931f8c046d164b9b22587fbf0e63807 100644 (file)
--- 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