From 26157f6dd1db14baf957b3014739378d60f6daa3 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sun, 6 Apr 2008 15:57:01 +0000 Subject: [PATCH] Added a small patch from Tim Yamin to fix make.conf parsing of variables with numbers in them. This is catalyst 2.0.6_pre17 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1389 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 2 +- modules/catalyst_support.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14c4e61d..d4e42ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Apr 2008; Chris Gianelloni catalyst, + modules/catalyst_support.py: + Added a small patch from Tim Yamin 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 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 13ff0b63..35dd14da 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 4c0769d6..d8e1ac39 100644 --- 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