diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-03-02 00:16:30 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-03-02 00:16:30 +0000 |
| commit | 8596c421267881b186e7aa384d6a2d6746cfaf6d (patch) | |
| tree | 2df0350646aa4df4898fd56880f1278082c34c63 /pym | |
| parent | Fixed a couple of syntax errors. (diff) | |
| download | portage-cvs-8596c421267881b186e7aa384d6a2d6746cfaf6d.tar.gz portage-cvs-8596c421267881b186e7aa384d6a2d6746cfaf6d.tar.bz2 portage-cvs-8596c421267881b186e7aa384d6a2d6746cfaf6d.zip | |
Added missing bsd_chflags import required after forward porting.
Added -* to FEATURES before saving back to the env after modification.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 | ||||
| -rw-r--r-- | pym/portage_util.py | 14 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pym/portage.py b/pym/portage.py index dcc17b4..316d061 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.574 2005/02/26 06:35:20 jstubbs Exp $ -cvs_id_string="$Id: portage.py,v 1.574 2005/02/26 06:35:20 jstubbs Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.575 2005/03/02 00:16:30 jstubbs Exp $ +cvs_id_string="$Id: portage.py,v 1.575 2005/03/02 00:16:30 jstubbs Exp $"[5:-2] -VERSION="$Revision: 1.574 $"[11:-2] + "-cvs" +VERSION="$Revision: 1.575 $"[11:-2] + "-cvs" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT @@ -1160,7 +1160,7 @@ class config: self.features.append("test") self.features.sort() - self["FEATURES"] = " ".join(self.features) + self["FEATURES"] = " ".join(["-*"]+self.features) self.backup_changes("FEATURES") if mycpv: diff --git a/pym/portage_util.py b/pym/portage_util.py index ef09096..ccb4523 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -1,11 +1,21 @@ # Copyright 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_util.py,v 1.18 2005/02/26 06:35:20 jstubbs Exp $ -cvs_id_string="$Id: portage_util.py,v 1.18 2005/02/26 06:35:20 jstubbs Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage_util.py,v 1.19 2005/03/02 00:16:30 jstubbs Exp $ +cvs_id_string="$Id: portage_util.py,v 1.19 2005/03/02 00:16:30 jstubbs Exp $"[5:-2] import sys,string,shlex,os.path,stat,types import shutil +try: + #XXX: This should get renamed to bsd_chflags, I think. + import chflags + bsd_chflags = chflags +except SystemExit, e: + raise +except: + # XXX: This should get renamed to bsd_chflags, I think. + bsd_chflags = None + noiselimit = 0 def writemsg(mystr,noiselevel=0): """Prints out warning and debug messages based on the noiselimit setting""" |