aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-04-23 07:30:54 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-04-23 07:30:54 +0000
commit1f82054ba4569d295251e487a30d8c4a0bed2711 (patch)
tree61bf0de99118f672e9acf0ca3dd0bfd74552050f
parentAdded a 3 second delay after a failed Manifest commit. Fixed bug where (diff)
downloadportage-cvs-1f82054ba4569d295251e487a30d8c4a0bed2711.tar.gz
portage-cvs-1f82054ba4569d295251e487a30d8c4a0bed2711.tar.bz2
portage-cvs-1f82054ba4569d295251e487a30d8c4a0bed2711.zip
Modified sandbox path to use the external sandbox.
-rw-r--r--ChangeLog5
-rw-r--r--pym/portage_const.py6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a7939d2..9ed50b6 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.796.2.99 2005/04/23 07:26:03 jstubbs Exp $
+# $Id: ChangeLog,v 1.796.2.100 2005/04/23 07:30:54 jstubbs 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.
+ 23 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage_const.py:
+ Adjusted sandbox path to match the external sandbox.
+
23 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/repoman: Added a 3 second
delay after a failed Manifest commit. Fixed bug where files at the category
level were being treated as packages.
diff --git a/pym/portage_const.py b/pym/portage_const.py
index 86658ed..3602299 100644
--- a/pym/portage_const.py
+++ b/pym/portage_const.py
@@ -1,8 +1,8 @@
# portage: Constants
# 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_const.py,v 1.3.2.1 2005/01/16 02:35:33 carpaski Exp $
-cvs_id_string="$Id: portage_const.py,v 1.3.2.1 2005/01/16 02:35:33 carpaski Exp $"[5:-2]
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage_const.py,v 1.3.2.2 2005/04/23 07:30:54 jstubbs Exp $
+cvs_id_string="$Id: portage_const.py,v 1.3.2.2 2005/04/23 07:30:54 jstubbs Exp $"[5:-2]
# ===========================================================================
# START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF
@@ -24,7 +24,7 @@ PROFILE_PATH = "/etc/make.profile"
LOCALE_DATA_PATH = PORTAGE_BASE_PATH+"/locale"
EBUILD_SH_BINARY = PORTAGE_BIN_PATH+"/ebuild.sh"
-SANDBOX_BINARY = PORTAGE_BIN_PATH+"/sandbox"
+SANDBOX_BINARY = "/usr/bin/sandbox"
DEPSCAN_SH_BINARY = "/sbin/depscan.sh"
BASH_BINARY = "/bin/bash"
MOVE_BINARY = "/bin/mv"