set USER and LOGNAME when running with userpriv

some builds/tests get confused when running as paludisbuild with USER=root.

1 files changed, 4 insertions, 1 deletions

diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 421e27771..f44ccc163 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -141,7 +141,10 @@ EbuildCommand::operator() ()
                     throw ActionFailedError("Need to be able to use non-0 user and group for userpriv for '" +
                             stringify(*package_id) + "'");
         }
-        process.setuid_setgid(params.environment()->reduced_uid(), params.environment()->reduced_gid());
+        process
+            .setuid_setgid(params.environment()->reduced_uid(), params.environment()->reduced_gid())
+            .setenv("USER", params.environment()->reduced_username())
+            .setenv("LOGNAME", params.environment()->reduced_username());
     }
 
     using namespace std::placeholders;