From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RDouv-0007ZM-Bm for garchives@archives.gentoo.org; Wed, 12 Oct 2011 02:51:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 158FF21C02E; Wed, 12 Oct 2011 02:51:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BCE7521C02E for ; Wed, 12 Oct 2011 02:51:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FA2F1B402E for ; Wed, 12 Oct 2011 02:51:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D32898004F for ; Tue, 11 Oct 2011 23:46:00 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <7ab4d5722a828167dd1bf946b26cfa80808f59fc.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/, pym/portage/, cnf/ X-VCS-Repository: proj/portage X-VCS-Files: cnf/make.globals man/emerge.1 man/make.conf.5 pym/portage/_global_updates.py pym/portage/const.py X-VCS-Directories: man/ pym/portage/ cnf/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7ab4d5722a828167dd1bf946b26cfa80808f59fc Date: Tue, 11 Oct 2011 23:46:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 558f02f8525e3b89db79e1514eba2dc9 commit: 7ab4d5722a828167dd1bf946b26cfa80808f59fc Author: Zac Medico gentoo org> AuthorDate: Tue Oct 11 23:45:46 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 11 23:45:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7ab4d572 Remove FEATURES=3Dfixpackages support. This reduces the probability of users encountering issues related to package moves when they disable --dynamic-deps, and --package-moves=3Dn can be set in EMERGE_DEFAULT_OPTS if package moves need to be temporarily avoided for some reason. --- cnf/make.globals | 2 +- man/emerge.1 | 12 +++++------- man/make.conf.5 | 5 ----- pym/portage/_global_updates.py | 3 +-- pym/portage/const.py | 2 +- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/cnf/make.globals b/cnf/make.globals index fcd0b41..aef2695 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -51,7 +51,7 @@ RESUMECOMMAND_SSH=3D${FETCHCOMMAND_SSH} FETCHCOMMAND_SFTP=3D"bash -c \"x=3D\\\${2#sftp://} ; host=3D\\\${x%%/*} = ; port=3D\\\${host##*:} ; host=3D\\\${host%:*} ; [[ \\\${host} =3D \\\${p= ort} ]] && port=3D22 ; exec sftp -P \\\${port} \\\"\\\${host}:/\\\${x#*/}= \\\" \\\"\\\$1\\\"\" sftp \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" =20 # Default user options -FEATURES=3D"assume-digests binpkg-logs distlocks ebuild-locks fixpackage= s +FEATURES=3D"assume-digests binpkg-logs distlocks ebuild-locks fixlafiles news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch" diff --git a/man/emerge.1 b/man/emerge.1 index 10be789..6088cdc 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -415,13 +415,11 @@ installed packages to vary dynamically when source = ebuild dependencies are modified. This option is enabled by default. =20 \fBWARNING:\fR -If \-\-dynamic\-deps is disabled, then it is necessary to ensure that -an alternative method is used to handle package moves in dependencies -of installed packages. Normally, this is handled by -FEATURES=3D"fixpackages", which is enabled by default and may be -disabled via \fBmake.conf\fR(5). Alternatively, in order to manually -apply package moves, run `emaint \-\-fix moveinst` after each -emerge \-\-sync operation (see \fBemaint\fR(1)). +If you want to disable \-\-dynamic\-deps, then it may be necessary to +first run \fBfixpackages\fR in order to get the best results. The +\fBfixpackages\fR command performs two different operations that can +also be performed separately by the `emaint \-\-fix moveinst` and +`emaint \-\-fix movebin` commands (see \fBemaint\fR(1)). .TP .BR "\-\-emptytree " (\fB\-e\fR) Reinstalls target atoms and their entire deep diff --git a/man/make.conf.5 b/man/make.conf.5 index 6c64686..a2221cf 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -295,11 +295,6 @@ probably also want to enable \fBPORT_LOGDIR\fR in or= der to save the build log. Both the \fBebuild\fR(1) command and the \fInoclean\fR feature cause the \fIfail\-clean\fR feature to be automatically disabled. .TP -.B fixpackages -Runs the script that will fix the dependencies in all binary packages. = This is=20 -run whenever packages are moved around in the portage tree. Please note= that this=20 -can take a lot of time. -.TP .B getbinpkg Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\f= R. See=20 \fBmake.conf\fR(5) for more information. diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates= .py index 868d1ee..be8a734 100644 --- a/pym/portage/_global_updates.py +++ b/pym/portage/_global_updates.py @@ -217,8 +217,7 @@ def _global_updates(trees, prev_mtimes, quiet=3DFalse= ): =20 do_upgrade_packagesmessage =3D False # We gotta do the brute force updates for these now. - if mysettings.get("PORTAGE_CALLER") =3D=3D "fixpackages" or \ - "fixpackages" in mysettings.features: + if True: def onUpdate(maxval, curval): if curval > 0: writemsg_stdout("#") diff --git a/pym/portage/const.py b/pym/portage/const.py index e3627ea..29c3878 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -90,7 +90,7 @@ SUPPORTED_FEATURES =3D frozenset([ "ccache", "chflags", "clean-logs", "collision-protect", "compress-build-logs", "digest", "distcc", "distcc-pump", "distlocks= ", "ebuild-locks", "fakeroot", - "fail-clean", "fixpackages", "force-mirror", = "getbinpkg", + "fail-clean", "force-mirror", "getbinpkg", "installsources", "keeptemp", "keepwork", "fi= xlafiles", "lmirror", "metadata-transfer", "mirror", "multilib-stri= ct", "news", "noauto", "noclean", "nodoc", "noinfo", "noma= n",