summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-02-27 07:56:38 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-02-27 07:56:38 +0000
commitb6274fef7e52703b5b401524a97b2b69f63553d1 (patch)
tree4d9b13e901bc88e86dbb5d8c09aaffeec4b71ef1
parentBSD/Darwin patch. (diff)
downloadportage-cvs-b6274fef7e52703b5b401524a97b2b69f63553d1.tar.gz
portage-cvs-b6274fef7e52703b5b401524a97b2b69f63553d1.tar.bz2
portage-cvs-b6274fef7e52703b5b401524a97b2b69f63553d1.zip
Added back sorting of the final list from portdbapi.cp_all() so that emerge
regen is ordered correctly.
-rw-r--r--ChangeLog6
-rw-r--r--pym/portage.py10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index a34597a..4ee5725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.73 2005/02/26 11:22:37 carpaski Exp $
+# $Id: ChangeLog,v 1.796.2.74 2005/02/27 07:56:38 jstubbs Exp $
MAJOR CHANGES in 2.0.51:
1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
@@ -9,6 +9,10 @@
*portage-2.0.51.17 (26 Feb 2004): Maintainence Release + BSD chflags
+ 27 Feb 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Added back
+ sorting of the final list from portdbapi.cp_all() so that emerge regen
+ is ordered correctly.
+
26 Feb 2005; Nicholas Jones <carpaski@gentoo.org> *: Darwin userland patch
from Kito (bug 82312). Adjusted a couple bits like the file was installed
with message and etc-update's USERLAND check per Jason suggestion.
diff --git a/pym/portage.py b/pym/portage.py
index 22c4160..4233111 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1,10 +1,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.524.2.43 2005/02/26 11:22:38 carpaski Exp $
-cvs_id_string="$Id: portage.py,v 1.524.2.43 2005/02/26 11:22:38 carpaski Exp $"[5:-2]
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.44 2005/02/27 07:56:38 jstubbs Exp $
+cvs_id_string="$Id: portage.py,v 1.524.2.44 2005/02/27 07:56:38 jstubbs Exp $"[5:-2]
-VERSION="$Revision: 1.524.2.43 $"[11:-2] + "-cvs"
+VERSION="$Revision: 1.524.2.44 $"[11:-2] + "-cvs"
# ===========================================================================
# START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
@@ -5415,7 +5415,9 @@ class portdbapi(dbapi):
for y in listdir(oroot+"/"+x,EmptyOnError=1,ignorecvs=1):
mykey=x+"/"+y
d[x+"/"+y] = None
- return d.keys()
+ l = d.keys()
+ l.sort()
+ return l
def p_list(self,mycp):
d={}