diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-01-02 13:12:49 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-01-02 13:12:49 +0000 |
| commit | afb1fc5e088fa4bbd89ad238a95624d1171774c9 (patch) | |
| tree | 4aab9e4816fbcba0f80dc8bc34d14963b3ed372e | |
| parent | Added new feature "conf-unmerge" that will cause CONFIG_PROTECT to be (diff) | |
| download | portage-cvs-afb1fc5e088fa4bbd89ad238a95624d1171774c9.tar.gz portage-cvs-afb1fc5e088fa4bbd89ad238a95624d1171774c9.tar.bz2 portage-cvs-afb1fc5e088fa4bbd89ad238a95624d1171774c9.zip | |
Reverted previous commit
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | pym/portage.py | 5 |
2 files changed, 3 insertions, 8 deletions
@@ -1,16 +1,12 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.796.2.36 2005/01/02 13:03:24 jstubbs Exp $ +# $Id: ChangeLog,v 1.796.2.37 2005/01/02 13:12:49 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. - 02 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> portage.py: Added new feature - "conf-unmerge" that will cause CONFIG_PROTECT to be ignored when unmerging. - (mtime and md5 sums still apply) #8423 - 02 Dec 2005; Jason Stubbs <jstubbs@gentoo.org> dolib ebuild.sh preplib: Applied eradicator's libdir patch for multilib support. #75420 diff --git a/pym/portage.py b/pym/portage.py index ab04af0..726bd8a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1,7 +1,7 @@ # 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.20 2005/01/02 13:03:24 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.21 2005/01/02 13:12:49 jstubbs Exp $ # =========================================================================== # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF @@ -5998,7 +5998,6 @@ class dblink: mydirs=[] mysyms=[] modprotect="/lib/modules/" - confunmerge = ("conf-unmerge" in settings.features) for obj in mykeys: obj=os.path.normpath(obj) if obj[:2]=="//": @@ -6015,7 +6014,7 @@ class dblink: # upgraded. We effectively only want one half of the config protection # functionality for /lib/modules. For portage-ng both capabilities # should be able to be independently specified. - if (not confunmerge and self.isprotected(obj)) or ((len(obj) > len(modprotect)) and (obj[0:len(modprotect)]==modprotect)): + if self.isprotected(obj) or ((len(obj) > len(modprotect)) and (obj[0:len(modprotect)]==modprotect)): print "--- cfgpro "+str(pkgfiles[obj][0]), obj continue |