From 0e5ffcb9700270bd52f69b72cf4672a6d0085999 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 25 Apr 2006 15:21:37 +0000 Subject: [PATCH] Added patch to parse_spec by Andrew Gaffney and for bug #131190. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1124 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- modules/catalyst_support.py | 9 ++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60770bae..71ed4846 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.609 2006/04/25 15:17:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.610 2006/04/25 15:21:37 wolf31o2 Exp $ + + 25 Apr 2006; Chris Gianelloni + modules/catalyst_support.py: + Added patch to parse_spec by Andrew Gaffney and for + bug #131190. 25 Apr 2006; Chris Gianelloni targets/support/livecdfs-update.sh: diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index db679d44..3f4bb797 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.69 2006/04/18 20:59:12 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/catalyst_support.py,v 1.70 2006/04/25 15:21:37 wolf31o2 Exp $ import sys,string,os,types,re,signal,traceback,time #import md5,sha @@ -583,18 +583,17 @@ def parse_spec(mylines): mobjs = white_space.split(myline) cur_array += mobjs + # XXX: Do we really still need this "single value is a string" behavior? if len(cur_array) == 2: myspec[cur_array[0]] = cur_array[1] else: myspec[cur_array[0]] = cur_array[1:] - for x in myspec: + for x in myspec.keys(): # Delete empty key pairs if not myspec[x]: - print "\n\tWARNING: No value set for key: "+x - print "\tdeleting key: "+x+"\n" + print "\n\tWARNING: No value set for key " + x + "...deleting" del myspec[x] - #print myspec return myspec def parse_makeconf(mylines): -- 2.26.2