From 505b6b044b132b28e1501491bcfe6bd68ca1989e Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Tue, 19 May 2020 01:02:44 +0100
Subject: refactor(3p/nix/libstore): Replace logging.h with glog

---
 third_party/nix/src/libstore/builtins/buildenv.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'third_party/nix/src/libstore/builtins/buildenv.cc')

diff --git a/third_party/nix/src/libstore/builtins/buildenv.cc b/third_party/nix/src/libstore/builtins/buildenv.cc
index ce054a430309..68b2dd0f391d 100644
--- a/third_party/nix/src/libstore/builtins/buildenv.cc
+++ b/third_party/nix/src/libstore/builtins/buildenv.cc
@@ -1,4 +1,5 @@
 #include <fcntl.h>
+#include <glog/logging.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <algorithm>
@@ -22,10 +23,8 @@ static void createLinks(const Path& srcDir, const Path& dstDir, int priority) {
     srcFiles = readDirectory(srcDir);
   } catch (SysError& e) {
     if (e.errNo == ENOTDIR) {
-      printError(
-          "warning: not including '%s' in the user environment because it's "
-          "not a directory",
-          srcDir);
+      LOG(ERROR) << "warning: not including '" << srcDir
+                 << "' in the user environment because it's not a directory";
       return;
     }
     throw;
@@ -43,7 +42,7 @@ static void createLinks(const Path& srcDir, const Path& dstDir, int priority) {
         throw SysError("getting status of '%1%'", srcFile);
     } catch (SysError& e) {
       if (e.errNo == ENOENT || e.errNo == ENOTDIR) {
-        printError("warning: skipping dangling symlink '%s'", dstFile);
+        LOG(ERROR) << "warning: skipping dangling symlink '" << dstFile << "'";
         continue;
       }
       throw;
@@ -200,7 +199,7 @@ void builtinBuildenv(const BasicDerivation& drv) {
     for (const auto& pkgDir : pkgDirs) addPkg(pkgDir, priorityCounter++);
   }
 
-  printError("created %d symlinks in user environment", symlinks);
+  LOG(INFO) << "created " << symlinks << " symlinks in user environment";
 
   createSymlink(getAttr("manifest"), out + "/manifest.nix");
 }
-- 
cgit 1.4.1