diff options
| author |   Marius Mauch <genone@gentoo.org> | 2005-03-08 04:29:58 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2005-03-08 04:29:58 +0000 |
| commit | 5222f01780bb2079285d3e4ef89ba4299f6f21ab (patch) | |
| tree | bdc31f1d49a0e76e8a658f2eb39044c4d6a99801 | |
| parent | reverting broken patch to cp_all() (diff) | |
| download | portage-cvs-5222f01780bb2079285d3e4ef89ba4299f6f21ab.tar.gz portage-cvs-5222f01780bb2079285d3e4ef89ba4299f6f21ab.tar.bz2 portage-cvs-5222f01780bb2079285d3e4ef89ba4299f6f21ab.zip | |
fixing RESTRICT=fetch
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | pym/ebuild.py | 8 | ||||
| -rw-r--r-- | pym/portage.py | 12 |
3 files changed, 17 insertions, 11 deletions
@@ -1,14 +1,18 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.923 2005/03/08 01:18:47 genone Exp $ +# $Id: ChangeLog,v 1.924 2005/03/08 04:29:57 genone 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. + 08 Mar 2005; Marius Mauch <genone@gentoo.org> pym/portage.py, pym/ebuild.py: + Fixing fetch restriction code. Replace references to PORTAGE_RESTRICT with + just RESTRICT and fix broken writemsg() calls. + 08 Mar 2005; Marius Mauch <genone@gentoo.org> pym/portage.py: - reverting broken patch for fakedbapi.cp_all(): it returned a nested list + Reverting broken patch for fakedbapi.cp_all(): it returned a nested list instead of a simple list and was weird at best. 06 Mar 2005; Brian Harring <ferringb@gentoo.org> autogen.sh: diff --git a/pym/ebuild.py b/pym/ebuild.py index 2224a14..12d1a41 100644 --- a/pym/ebuild.py +++ b/pym/ebuild.py @@ -2,7 +2,7 @@ # ebuild.py; Ebuild classes/abstraction of phase processing, and communicating with a ebuild-daemon.sh instance # 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/ebuild.py,v 1.16 2005/03/02 06:46:04 ferringb Exp $ +#$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/ebuild.py,v 1.17 2005/03/08 04:29:58 genone Exp $ import os,sys,traceback @@ -625,11 +625,11 @@ class ebuild_handler: if mydo!="depend": try: - mysettings["INHERITED"],mysettings["PORTAGE_RESTRICT"] = db[root][tree].dbapi.aux_get( + mysettings["INHERITED"],mysettings["RESTRICT"] = db[root][tree].dbapi.aux_get( mycpv,["INHERITED","RESTRICT"]) - mysettings["PORTAGE_RESTRICT"]=string.join(flatten(portage_dep.use_reduce( - portage_dep.paren_reduce(mysettings["PORTAGE_RESTRICT"]), + mysettings["RESTRICT"]=string.join(flatten(portage_dep.use_reduce( + portage_dep.paren_reduce(mysettings["RESTRICT"]), uselist=mysettings["USE"].split() )),' ') except SystemExit, e: diff --git a/pym/portage.py b/pym/portage.py index 1e1ce51..0590ecb 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.578 2005/03/08 01:18:47 genone Exp $ -cvs_id_string="$Id: portage.py,v 1.578 2005/03/08 01:18:47 genone Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.579 2005/03/08 04:29:58 genone Exp $ +cvs_id_string="$Id: portage.py,v 1.579 2005/03/08 04:29:58 genone Exp $"[5:-2] -VERSION="$Revision: 1.578 $"[11:-2] + "-cvs" +VERSION="$Revision: 1.579 $"[11:-2] + "-cvs" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT @@ -818,10 +818,12 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", mystat=os.stat(mysettings["DISTDIR"]+"/"+myfile) except (OSError,IOError),e: # file does not exist - writemsg(_("!!! %(file)s not found in %(dir)s." % {"file":myfile, "dir":mysettings["DISTDIR"]}),verbosity) + # FIXME: gettext doesn't work yet + # writemsg(_("!!! %(file)s not found in %(dir)s." % {"file":myfile, "dir":mysettings["DISTDIR"]}),verbosity) + writemsg("!!! %(file)s not found in %(dir)s." % {"file":myfile, "dir":mysettings["DISTDIR"]},verbosity) gotit=0 if not gotit: - writemsg("\n!!!",mysettings["CATEGORY"]+"/"+mysettings["PF"],"has fetch restriction turned on.\n"+ + writemsg("\n!!!"+mysettings["CATEGORY"]+"/"+mysettings["PF"]+"has fetch restriction turned on.\n"+ "!!! This probably means that this ebuild's files must be downloaded\n"+ "!!! manually. See the comments in the ebuild for more information.\n\n", verbosity) |