Patches for bugs in -r7 (73136, 73167)

4 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index ee58f9c..6186703 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.22 2004/12/01 23:11:25 carpaski Exp $
+# $Id: ChangeLog,v 1.796.2.23 2004/12/03 04:15:29 carpaski Exp $
 
   MAJOR CHANGES in 2.0.51:
     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+*portage-2.0.51-r8 (03 Dec 2004): Cleanup
+
+  03 Dec 2004; Nicholas Jones <carpaski@gentoo.org> portage.py: Patches to
+  fix the matching bug #73136 and the '-atom' profile bug #73167.
+
 *portage-2.0.51-r7 (01 Dec 2004): Cleanup
 
   01 Dec 2004; Nicholas Jones <carpaski@gentoo.org> sandbox: updated with
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 0d846ae..979e403 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.5 2004/12/01 22:14:09 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.6 2004/12/03 04:15:29 carpaski Exp $
 
 export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/usr/lib/portage/pym:/dev/random"
 export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:${PORTAGE_TMPDIR}"
@@ -1524,7 +1524,7 @@ if [ "$*" != "depend" ] && [ "$*" != "clean" ]; then
 		addread "${CCACHE_DIR}"
 		addwrite "${CCACHE_DIR}"
 
-		[ -z "${CCACHE_SIZE}" ] && export CCACHE_SIZE="2G"
+		[ -z "${CCACHE_SIZE}" ] && export CCACHE_SIZE="500M"
 		ccache -M ${CCACHE_SIZE} &> /dev/null
 	fi
 
diff --git a/pym/portage.py b/pym/portage.py
index bb59d3a..9938636 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1,7 +1,7 @@
 # portage.py -- core Portage functionality
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.12 2004/12/01 22:14:09 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.13 2004/12/03 04:15:29 carpaski Exp $
 
 # ===========================================================================
 # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
@@ -752,6 +752,8 @@ def grabfile_package(myfilename,compatlevel=0):
 	pkgs=grabfile(myfilename,compatlevel)
 	for x in range(len(pkgs)-1,-1,-1):
 		pkg = pkgs[x]
+		if pkg[0] == "-":
+			pkg = pkg[1:]
 		if pkg[0] == "*":
 			pkg = pkg[1:]
 		if not isvalidatom(pkg):
@@ -5466,8 +5468,8 @@ class portdbapi(dbapi):
 			cp = dep_getkey(mycpv)
 			if pkgdict.has_key(cp):
 				matches = match_to_list(mycpv, pkgdict[cp].keys())
-				for match in matches:
-					pgroups.extend(pkgdict[cp][match])
+				for atom in matches:
+					pgroups.extend(pkgdict[cp][atom])
 			for gp in mygroups:
 				if gp=="*":
 					writemsg("--- WARNING: Package '%s' uses '*' keyword.\n" % mycpv)
diff --git a/pym/portage_util.py b/pym/portage_util.py
index 27101de..92072b4 100644
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage_util.py,v 1.11.2.1 2004/10/27 14:39:30 jstubbs Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage_util.py,v 1.11.2.2 2004/12/03 04:15:29 carpaski Exp $
 
 import sys,string,shlex,os.path
 
@@ -166,6 +166,8 @@ def grabfile_package(myfilename,compatlevel=0):
 	pkgs=grabfile(myfilename,compatlevel)
 	for x in range(len(pkgs)-1,-1,-1):
 		pkg = pkgs[x]
+		if pkg[0] == "-":
+			pkg = pkg[1:]
 		if pkg[0] == "*": # Kill this so we can deal the "packages" file too
 			pkg = pkg[1:]
 		if not isvalidatom(pkg):