diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-05-01 16:04:51 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-05-01 16:04:51 +0000 |
| commit | a8740ce518ae3b5d298a4cb3948bfebfcf3abc07 (patch) | |
| tree | 0102a9493602860119741dcde3255b51739ba1a6 | |
| parent | Added checking of overlays for package.mask, categories and others. (diff) | |
| download | portage-cvs-a8740ce518ae3b5d298a4cb3948bfebfcf3abc07.tar.gz portage-cvs-a8740ce518ae3b5d298a4cb3948bfebfcf3abc07.tar.bz2 portage-cvs-a8740ce518ae3b5d298a4cb3948bfebfcf3abc07.zip | |
Dropped confmem from 16 previous files down to 1 previous file so that
upgrading and downgrading behaves in terms of config files.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | pym/portage.py | 10 | ||||
| -rwxr-xr-x | tarball.sh | 6 |
3 files changed, 15 insertions, 9 deletions
@@ -1,12 +1,18 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.796.2.115 2005/05/01 12:46:51 jstubbs Exp $ +# $Id: ChangeLog,v 1.796.2.116 2005/05/01 16:04:51 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. +*portage-2.0.51.21 (01 May 2005): Maintainence Release + + 01 May 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Dropped + confmem from 16 previous files down to 1 previous file so that upgrading + and downgrading behaves in terms of config files. + 01 May 2005; Jason Stubbs <jstubbs@gentoo.org> pym/portage.py: Added checking of overlays for package.mask, categories and others. diff --git a/pym/portage.py b/pym/portage.py index 12580f6..5918650 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.68 2005/05/01 12:46:51 jstubbs Exp $ -cvs_id_string="$Id: portage.py,v 1.524.2.68 2005/05/01 12:46:51 jstubbs Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.69 2005/05/01 16:04:51 jstubbs Exp $ +cvs_id_string="$Id: portage.py,v 1.524.2.69 2005/05/01 16:04:51 jstubbs Exp $"[5:-2] -VERSION="$Revision: 1.524.2.68 $"[11:-2] + "-cvs" +VERSION="$Revision: 1.524.2.69 $"[11:-2] + "-cvs" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT @@ -6799,8 +6799,8 @@ class dblink: cfgfiledict[myrealdest]=[] if mymd5 not in cfgfiledict[myrealdest]: cfgfiledict[myrealdest].append(mymd5) - #don't record more than 16 md5sums - if len(cfgfiledict[myrealdest])>16: + # only record the last md5 + if len(cfgfiledict[myrealdest])>1: del cfgfiledict[myrealdest][0] if cfgprot: @@ -1,5 +1,5 @@ #!/bin/bash -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/Attic/tarball.sh,v 1.181.2.1 2004/11/30 23:24:04 vapier Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/Attic/tarball.sh,v 1.181.2.2 2005/05/01 16:04:51 jstubbs Exp $ if [ -z "$1" ]; then echo @@ -54,5 +54,5 @@ cd $TMP rm -f ${PKG}-${V}/bin/emerge.py ${PKG}-${V}/bin/{pmake,sandbox} ${PKG}-${V}/{bin,pym}/'.#'* ${PKG}-${V}/{bin,pym}/*.{orig,diff} ${PKG}-${V}/{bin,pym}/*.py[oc] tar cjvf ${TMP}/${PKG}-${V}.tar.bz2 ${PKG}-${V} -scp ${TMP}/${PKG}-${V}.tar.bz2 carpaski@twobit.net:/home/html/gentoo/portage/ -scp ${TMP}/${PKG}-${V}.tar.bz2 carpaski@zarquon.twobit.net:/home/www/localhost/htdocs/gentoo/portage/ +#scp ${TMP}/${PKG}-${V}.tar.bz2 carpaski@twobit.net:/home/html/gentoo/portage/ +#scp ${TMP}/${PKG}-${V}.tar.bz2 carpaski@zarquon.twobit.net:/home/www/localhost/htdocs/gentoo/portage/ |