From: Chris Gianelloni Date: Fri, 8 Sep 2006 20:00:57 +0000 (+0000) Subject: Added fix for bug #143348. X-Git-Tag: CATALYST_2_0_6_916~319 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b49ca65979ac66a7d758928028b95efad3cd6f5;p=catalyst.git Added fix for bug #143348. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1175 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 298b37c2..9c03d9bb 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.659 2006/08/23 11:20:23 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.660 2006/09/08 20:00:57 wolf31o2 Exp $ + + 08 Sep 2006; Chris Gianelloni + modules/catalyst_support.py: + Added fix for bug #143348. 23 Aug 2006; Chris Gianelloni targets/support/livecdfs-update.sh: diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index 90fe8d37..f6ce0e0e 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.74 2006/05/19 16:25:20 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.75 2006/09/08 20:00:57 wolf31o2 Exp $ import sys,string,os,types,re,signal,traceback,time #import md5,sha @@ -89,7 +89,7 @@ def calc_hash2(file,cmd,cmd_args,id_string="MD5",verbose=False): hash=mylines[0] short_file=os.path.split(mylines[1])[1] a.close() - result=header+hash+" "+short_file+"\n" + result=header+hash+" "+short_file+"\n" if verbose: print header+" (%s) = %s" % (short_file, result) return result