Added patch to parse_spec by Andrew Gaffney <agaffney@gentoo.org> and for bug #131190.

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

diff --git a/ChangeLog b/ChangeLog
index 60770baed78b01ee2c23493ad440706159a1321a..71ed4846abc1ce3997430735105fe71b166d9089 100644 (file)
--- 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 <wolf31o2@gentoo.org>
+  modules/catalyst_support.py:
+  Added patch to parse_spec by Andrew Gaffney <agaffney@gentoo.org> and for
+  bug #131190.
 
   25 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index db679d44ce0ae1d1b260a488f882870d2487c2ec..3f4bb7974afb0bd69144510f6ac6186861a5603c 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.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):