From 70ebcaef746c2d05174b3e7d935eafc0fe3e32a0 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 31 Mar 2007 11:15:41 +0000 Subject: [PATCH] Merged from trunk 6320:6325 +------------------------------------------------------------------------+ | 6321 | For bug #172571, use socket.AF_INET as the default family | | zmedico | for socket.getaddrinfo(). | |----------+-------------------------------------------------------------| | 6324 | make PDEPEND wording less restrictive #172511 and clarify | | SpankMan | install status wrt ||() as noted by ferringb | |----------+-------------------------------------------------------------| | 6325 | Fix missing import. | | zmedico | | +------------------------------------------------------------------------+ svn path=/main/branches/prefix/; revision=6327 --- man/ebuild.5 | 19 +++++++++++-------- pym/emerge/__init__.py | 2 +- pym/portage/__init__.py | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/man/ebuild.5 b/man/ebuild.5 index 0e88646b8..c4296d053 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -282,9 +282,9 @@ appropriate, this syntax can easily be used. .B app\-games/unreal\-tournament\-goty .B ) .fi -Here we see that unreal\-tournament has a normal version and it has a goty version. -Since they provide the same base set of files, another package can use either. -Adding a virtual is inappropriate due to the small scope of it. +Here we see that unreal\-tournament has a normal version and it has a goty +version. Since they provide the same base set of files, another package can +use either. Adding a virtual is inappropriate due to the small scope of it. .br Another good example is when a package can be built with multiple video interfaces, but it can only ever have just one. @@ -298,9 +298,12 @@ interfaces, but it can only ever have just one. .B ) .fi Here only one of the packages will be chosen, and the order of preference is -determined by the order in which they appear. So sdl has the best chance of being -chosen, followed by svga, then opengl, then ggi, with a default of X if the user -does not specify any of the previous choices. +determined by the order in which they appear. So sdl has the best chance of +being chosen, followed by svga, then opengl, then ggi, with a default of X if +the user does not specify any of the previous choices. +.br +Note that if any of the packages listed are already merged, the package manager +will use that to consider the dependency satisfied. .RE .RE @@ -313,8 +316,8 @@ defaults to the value of \fBDEPEND\fR. You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR. .TP \fBPDEPEND\fR -This should contain a list of all packages that will have to be installed after -the program has been merged. +This should contain a list of all packages that should be merged after this one, +but may be merged before if need be. .br You may use the same syntax to vary dependencies as seen above in \fBDEPEND\fR. .TP diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index df0550554..ebf234991 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4035,7 +4035,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): all_rsync_opts = set(rsync_opts) all_rsync_opts.update( settings.get("PORTAGE_RSYNC_EXTRA_OPTS","").split()) - family = socket.AF_UNSPEC + family = socket.AF_INET if "-4" in all_rsync_opts or "--ipv4" in all_rsync_opts: family = socket.AF_INET elif socket.has_ipv6 and \ diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index aa8d2a24d..609b94a2e 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2336,6 +2336,7 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, **keyw if retval != os.EX_OK: for pid in mypids: if os.waitpid(pid, os.WNOHANG) == (0,0): + import signal os.kill(pid, signal.SIGTERM) os.waitpid(pid, 0) portage.process.spawned_pids.remove(pid) -- 2.26.2