aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--pym/portage.py8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index de6fba2..3f29dd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.1001 2005/08/13 23:00:32 ferringb Exp $
+# $Id: ChangeLog,v 1.1002 2005/08/14 16:49:41 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.
+ 15 Aug 2005; Marius Mauch <genone@gentoo.org> pym/portage.py:
+ Fix logic error with sandbox.
+
13 Aug 2005; Brian Harring <ferringb@gentoo.org> bin/ebuild-default-functions.sh,
bin/ebuild-functions.sh: merging spankys original changes (which I stupidly stomped)
forward.
diff --git a/pym/portage.py b/pym/portage.py
index 8cc4982..988d904 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.589 2005/04/29 04:43:19 vapier Exp $
-cvs_id_string="$Id: portage.py,v 1.589 2005/04/29 04:43:19 vapier Exp $"[5:-2]
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.590 2005/08/14 16:49:41 genone Exp $
+cvs_id_string="$Id: portage.py,v 1.590 2005/08/14 16:49:41 genone Exp $"[5:-2]
-VERSION="$Revision: 1.589 $"[11:-2] + "-cvs"
+VERSION="$Revision: 1.590 $"[11:-2] + "-cvs"
# ===========================================================================
# START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
@@ -5322,7 +5322,7 @@ for group in groups:
# Clear the cache
dircache={}
-if not "sandbox" in features or not "usersandbox" in features:
+if not "sandbox" in features and not "usersandbox" in features:
portage_exec.sandbox_capable = False
fetcher=None