aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-04-20 15:19:03 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-04-20 15:19:03 +0000
commit213aed4e0adc42977136df8ba0f61ad8f3a29efe (patch)
tree36c622780d0074ffb45da84894aff0478ed2904a
parentswegener strikes again... (s:beginswith:startswith:) (diff)
downloadportage-cvs-213aed4e0adc42977136df8ba0f61ad8f3a29efe.tar.gz
portage-cvs-213aed4e0adc42977136df8ba0f61ad8f3a29efe.tar.bz2
portage-cvs-213aed4e0adc42977136df8ba0f61ad8f3a29efe.zip
pym/portage.py: Adding setting of CBUILD to CHOST if it is not set. Fixed
getmaskingstatus to choose an arch-based keyword over -*. bin/ebuild.sh: Removed stale code from dyn_setup.
-rw-r--r--ChangeLog9
-rwxr-xr-xbin/ebuild.sh21
-rw-r--r--pym/portage.py16
3 files changed, 20 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 1206b83..1b96145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,19 @@
# ChangeLog for Portage; the Gentoo Linux ports system
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.97 2005/04/19 07:14:17 ferringb Exp $
+# $Id: ChangeLog,v 1.796.2.98 2005/04/20 15:19:02 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.
+ 21 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Adding
+ setting of CBUILD to CHOST if it is not set. Fixed getmaskingstatus to
+ choose an arch-based keyword over -*.
+
+ 21 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> bin/ebuild.sh: Removed
+ stale code from dyn_setup.
+
19 Apr 2005; Brian Harring <ferringb@gentoo.org> pym/portage_db_flat.py:
Correction for string method name, again, danke to swegener.
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 014314f..11dc97a 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.24 2005/02/26 11:22:37 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.25 2005/04/20 15:19:03 jstubbs 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}"
@@ -621,25 +621,6 @@ END
dyn_setup()
{
- if [ "$USERLAND" == "Linux" ]; then
- # The next bit is to ease the broken pkg_postrm()'s
- # some of the gcc ebuilds have that nuke the new
- # /lib/cpp and /usr/bin/cc wrappers ...
-
- # Make sure we can have it disabled somehow ....
- if [ "${DISABLE_GEN_GCC_WRAPPERS}" != "yes" ]; then
- # Create /lib/cpp if missing or a symlink
- if [ -L /lib/cpp -o ! -e /lib/cpp ]; then
- [ -L /lib/cpp ] && rm -f /lib/cpp
- gen_wrapper /lib/cpp cpp
- fi
- # Create /usr/bin/cc if missing for a symlink
- if [ -L /usr/bin/cc -o ! -e /usr/bin/cc ]; then
- [ -L /usr/bin/cc ] && rm -f /usr/bin/cc
- gen_wrapper /usr/bin/cc gcc
- fi
- fi
- fi
pkg_setup
}
diff --git a/pym/portage.py b/pym/portage.py
index 35389d5..64ceab2 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.57 2005/04/19 05:00:22 jstubbs Exp $
-cvs_id_string="$Id: portage.py,v 1.524.2.57 2005/04/19 05:00:22 jstubbs Exp $"[5:-2]
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.58 2005/04/20 15:19:03 jstubbs Exp $
+cvs_id_string="$Id: portage.py,v 1.524.2.58 2005/04/20 15:19:03 jstubbs Exp $"[5:-2]
-VERSION="$Revision: 1.524.2.57 $"[11:-2] + "-cvs"
+VERSION="$Revision: 1.524.2.58 $"[11:-2] + "-cvs"
# ===========================================================================
# START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
@@ -1203,6 +1203,10 @@ class config:
self["FEATURES"] = " ".join(["-*"]+self.features)
self.backup_changes("FEATURES")
+ if not len(self["CBUILD"]):
+ self["CBUILD"] = self["CHOST"]
+ self.backup_changes("CBUILD")
+
if mycpv:
self.setcpv(mycpv)
@@ -3902,19 +3906,21 @@ def getmaskingstatus(mycpv):
kmask=None
if kmask:
+ fallback = None
for gp in mygroups:
if gp=="*":
kmask=None
break
elif gp=="-*":
- kmask="-*"
- break
+ fallback="-*"
elif gp=="-"+myarch:
kmask="-"+myarch
break
elif gp=="~"+myarch:
kmask="~"+myarch
break
+ if kmask == "missing" and fallback:
+ kmask = fallback
if kmask:
rValue.append(kmask+" keyword")