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

diff --git a/man/ebuild.5 b/man/ebuild.5
index 0e88646b88d23e858cb27baa17a059e66a92817c..c4296d053a7b7187d0a40b2692786ff9d7d02ff6 100644 (file)
--- 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 df05505544bf5959b1053b12cde7e62426d7b5c9..ebf234991d61a09a7b8a4abea0275963b7d68dae 100644 (file)
--- 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 aa8d2a24d069db74d61ef546c25cf5461a30b7b0..609b94a2ed927ad2bd26fd85158c0ea4f22a4f03 100644 (file)
--- 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)