Added a small patch from Tim Yamin <tim.yamin@zonbu.com> to fix make.conf parsing...

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

diff --git a/ChangeLog b/ChangeLog
index 14c4e61d40a384b1d6c5fce62f689ed76e588de5..d4e42ec3136e25076488c39611d867fbe58e5503 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  modules/catalyst_support.py:
+  Added a small patch from Tim Yamin <tim.yamin@zonbu.com> to fix make.conf
+  parsing of variables with numbers in them. This is catalyst 2.0.6_pre17 for
+  testing.
+
   06 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-chroot.sh:
   Change back to using sys-apps/baselayout. We'll need to come up with a

diff --git a/catalyst b/catalyst
index 13ff0b6363ab8ba49d618fb26683f71d6d378392..35dd14da516bff287163e8b15e938a6076ddf646 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre16"
+__version__="2.0.6_pre17"
 
 conf_values={}
 

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 4c0769d62497e76385d10bcfb2b7a50bc9065d88..d8e1ac3927461170be0e73dd87b7a75441e580a3 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -658,7 +658,7 @@ def parse_spec(mylines):
 def parse_makeconf(mylines):
        mymakeconf={}
        pos=0
-       pat=re.compile("([a-zA-Z_]*)=(.*)")
+       pat=re.compile("([0-9a-zA-Z_]*)=(.*)")
        while pos<len(mylines):
                if len(mylines[pos])<=1:
                        #skip blanks