From: John P. Davis Date: Sun, 16 Jan 2005 15:05:50 +0000 (+0000) Subject: fix for grp with -f and -C X-Git-Tag: CATALYST_2_0_6_916~850 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=719319eea1f569d9c9d5b0acceaa221b6f33d9fa;p=catalyst.git fix for grp with -f and -C git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@523 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 23256893..5d07034c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.149 2005/01/13 22:57:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.150 2005/01/16 15:05:50 zhen Exp $ + + 16 Jan 2005; John Davis catalyst: + fix from pvdabeel@gentoo.org. patch fixes a small bug that caused grp to not + work when both -f and -C were used on the command line. 13 Jan 2005; Chris Gianelloni targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, diff --git a/catalyst b/catalyst index f6082bf4..2b8fd41c 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.58 2005/01/11 14:10:18 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.59 2005/01/16 15:05:50 zhen Exp $ # Maintained in full by John Davis @@ -278,11 +278,13 @@ if __name__ == "__main__": # import the rest of the catalyst modules targetmap=import_modules() + addlargs={} + if myspecfile: - addlargs=do_spec(myspecfile) + addlargs.update(do_spec(myspecfile)) if mycmdline: - addlargs=do_cli(mycmdline) + addlargs.update(do_cli(mycmdline)) # everything is setup, so the build is a go try: