From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 30 Apr 2018 21:04:13 +0000 (-0700)
Subject: [DeployPkg] Replace Log() references with g_log()
X-Git-Tag: stable-10.3.0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48dc7a57ff3fe5cb1441040876f74b69772c1ea5;p=thirdparty%2Fopen-vm-tools.git

[DeployPkg] Replace Log() references with g_log()

* Modified the code to replace a couple of Log() references with g_debug()
so that they are properly logged with 'deplogPkg' domain instead of the
generic 'vmsvc' domain in the tools log files.
---

diff --git a/open-vm-tools/services/plugins/deployPkg/deployPkg.c b/open-vm-tools/services/plugins/deployPkg/deployPkg.c
index 3b2727a6a..7c6a8affe 100644
--- a/open-vm-tools/services/plugins/deployPkg/deployPkg.c
+++ b/open-vm-tools/services/plugins/deployPkg/deployPkg.c
@@ -31,7 +31,6 @@
 #include "deployPkg/linuxDeployment.h"
 #endif
 
-#include "vm_assert.h"
 #include "file.h"
 #include "str.h"
 #include "util.h"
@@ -199,13 +198,13 @@ DeployPkgExecDeploy(ToolsAppCtx *ctx,   // IN: app context
    }
 
    /* Attempt to delete the package file and tempdir. */
-   Log("Deleting file %s\n", pkgNameStr);
+   g_debug("Deleting file %s\n", pkgNameStr);
    if (File_Unlink(pkgNameStr) == 0) {
       char *vol, *dir, *path;
       File_SplitName(pkgNameStr, &vol, &dir, NULL);
       path = Str_Asprintf(NULL, "%s%s", vol, dir);
       if (path != NULL) {
-         Log("Deleting directory %s\n", path);
+         g_debug("Deleting directory %s\n", path);
          File_DeleteEmptyDirectory(path);
          free(path);
       }