aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2005-03-08 01:18:47 +0000
committerMarius Mauch <genone@gentoo.org>2005-03-08 01:18:47 +0000
commit6df0075f58f938eaf692d52abdc319543f6bb516 (patch)
treec6b34913017d07685ee73ca084a95c1a814cd335
parentHarring's rule of CVS: "the bugs do not appear until the delta has been comm... (diff)
downloadportage-cvs-6df0075f58f938eaf692d52abdc319543f6bb516.tar.gz
portage-cvs-6df0075f58f938eaf692d52abdc319543f6bb516.tar.bz2
portage-cvs-6df0075f58f938eaf692d52abdc319543f6bb516.zip
reverting broken patch to cp_all()
-rw-r--r--ChangeLog6
-rw-r--r--pym/portage.py10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cf08938..7a3c6c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,16 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.922 2005/03/07 04:08:18 ferringb Exp $
+# $Id: ChangeLog,v 1.923 2005/03/08 01:18:47 genone 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.
+ 08 Mar 2005; Marius Mauch <genone@gentoo.org> pym/portage.py:
+ reverting broken patch for fakedbapi.cp_all(): it returned a nested list
+ instead of a simple list and was weird at best.
+
06 Mar 2005; Brian Harring <ferringb@gentoo.org> autogen.sh:
used for autogenerating auto* crap after a checkout.
diff --git a/pym/portage.py b/pym/portage.py
index 8d3aab0..1e1ce51 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2,10 +2,10 @@
# 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.577 2005/03/07 04:00:30 ferringb Exp $
-cvs_id_string="$Id: portage.py,v 1.577 2005/03/07 04:00:30 ferringb Exp $"[5:-2]
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.578 2005/03/08 01:18:47 genone Exp $
+cvs_id_string="$Id: portage.py,v 1.578 2005/03/08 01:18:47 genone Exp $"[5:-2]
-VERSION="$Revision: 1.577 $"[11:-2] + "-cvs"
+VERSION="$Revision: 1.578 $"[11:-2] + "-cvs"
# ===========================================================================
# START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
@@ -2458,7 +2458,9 @@ class fakedbapi(dbapi):
def cp_all(self):
returnme=[]
- return [y for y in [x for x in self.cpdict.values()]]
+ for x in self.cpdict.keys():
+ returnme.extend(self.cpdict[x])
+ return returnme
def cpv_inject(self,mycpv):
"""Adds a cpv from the list of available packages."""