Index: package.c
===================================================================
--- package.c	(revision 431)
+++ package.c	(working copy)
@@ -170,7 +170,7 @@
  FILE *pp;
  int result = 0;
 
-Verbose("Entering InstallPackage.\n");
+Debug("Entering InstallPackage.\n");
 
 switch(pkgmgr)
    {
@@ -242,7 +242,8 @@
 
 if (BuildCommandLine(instcmd,rawinstcmd,*pkglist))
    {
-   Verbose("InstallPackage(): using '%s'\n", instcmd);
+   snprintf(OUTPUT,CF_BUFSIZE,"Installing package(s) using '%s'\n", instcmd);
+   CfLog(cferror,OUTPUT,"");
    
    if (DONTDO)
       {
@@ -253,7 +254,7 @@
       {
       if ((pp = cfpopen(instcmd, "r")) == NULL)
          {
-         CfLog(cfinform,"Could not execute package install command.\n\n","popen");
+         CfLog(cferror,"Could not execute package install command.\n\n","popen");
          /* Return that the package is still not installed */
          return 0;
          }
@@ -261,25 +262,25 @@
       while (!feof(pp))
          {
          ReadLine(line,CF_BUFSIZE-1,pp);
-         snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line);
-         CfLog(cfinform,OUTPUT,""); 
+         snprintf(OUTPUT,CF_BUFSIZE,"%s\n",line);
+         CfLog(cferror,OUTPUT,""); 
          }
       
       if (cfpclose(pp) != 0)
          {
-         CfLog(cfinform,"Package install command was not successful.\n\n","popen");
+         CfLog(cferror,"Package install command was not successful.\n\n","popen");
          result = 0;
          }
       else
          {
-         CfLog(cfinform,"Successfully installed package(s).\n",""); 
+         CfLog(cferror,"Successfully installed package(s).\n\n",""); 
          result = 1;
          }
       }
    }
 else 
    {
-   CfLog(cferror,"Unable to evaluate package manager command.\n",""); 
+   CfLog(cferror,"Unable to evaluate package manager command.\n\n",""); 
    result = 0;
    }
 
@@ -306,7 +307,7 @@
    }
 else
    {
-   CfLog(cfinform,"Package cannot be upgraded because the old version was not removed.\n\n","");
+   CfLog(cferror,"Package cannot be upgraded because the old version was not removed.\n\n","");
    result = 0;
    }
 DeleteItemList(removelist);
@@ -352,7 +353,9 @@
 
 if (BuildCommandLine( delcmd, rawdelcmd, *pkglist))
    {
-   Verbose("RemovePackage(): using '%s'\n", delcmd);
+   snprintf(OUTPUT,CF_BUFSIZE,"Installing package(s) using '%s'\n", delcmd);
+   CfLog(cferror,OUTPUT,"");
+
    if (DONTDO)
       {
       Verbose("--skipping because DONTDO is enabled.\n");
@@ -369,25 +372,25 @@
       while (!feof(pp))
          {
          ReadLine(line,CF_BUFSIZE-1,pp);
-         snprintf(OUTPUT,CF_BUFSIZE,"Package removal: %s\n",line);
-         CfLog(cfinform,OUTPUT,""); 
+         snprintf(OUTPUT,CF_BUFSIZE,"%s\n",line);
+         CfLog(cferror,OUTPUT,""); 
          }
       
       if (cfpclose(pp) != 0)
          {
-         CfLog(cfinform,"Package removal command was not successful.\n",""); 
+         CfLog(cferror,"Package removal command was not successful.\n\n",""); 
          result = 0;
          }
       else
          {
-         CfLog(cfinform,"Successfully removed package(s).\n",""); 
+         CfLog(cferror,"Successfully removed package(s).\n\n",""); 
          result = 1;
          }
       }
    }
 else 
    {
-   CfLog(cferror,"Unable to evaluate package manager command.\n",""); 
+   CfLog(cferror,"Unable to evaluate package manager command.\n\n",""); 
    result = 0;
    }
 
@@ -433,7 +436,7 @@
 
 for (package = pkglist; package != NULL; package = package->next)
    {
-   Verbose("BuildCommandLine(): Processing package %s at location %d.\n", package->name, &package );
+   Debug("BuildCommandLine(): Processing package %s at location %d.\n", package->name, &package );
 
    if (cmd_args == CF_MAXSHELLARGS)
       {
@@ -473,7 +476,6 @@
       strncpy(cmd_ptr, cmd_tail, &resolvedcmd[CF_BUFSIZE*2] - cmd_ptr);
       }
    result = 1;
-   Verbose("Resolved command is '%s'\n", resolvedcmd );
    }
 return result;
 }
@@ -1565,7 +1567,7 @@
 *pkgversion = '\0';
 pkgversion += 1;
 
-Verbose("FreeBSDPackageCheck(): Requested version %s %s of %s\n", CMPSENSETEXT[cmp],(version[0] ? version : "ANY"), pkgname);
+Debug("FreeBSDPackageCheck(): Requested version %s %s of %s\n", CMPSENSETEXT[cmp],(version[0] ? version : "ANY"), pkgname);
 
 if (!*version)
    {
@@ -1588,7 +1590,7 @@
    {
    *VBUFF = '\0';
    ReadLine (line, CF_BUFSIZE - 1, pp);
-   snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line);
+   snprintf(OUTPUT,CF_BUFSIZE,"%s\n",line);
    }
 
 int result =  cfpclose( pp );
@@ -1634,7 +1636,7 @@
 *pkgversion = '\0';
 pkgversion += 1;
 
-Verbose("FreeBSDPackageList(): Requested version %s %s of %s\n", CMPSENSETEXT[cmp],(version[0] ? version : "ANY"), pkgname);
+Debug("FreeBSDPackageCheck(): Requested version %s %s of %s\n", CMPSENSETEXT[cmp],(version[0] ? version : "ANY"), pkgname);
 
 /* If no version was specified, we're just checking if the package
  * is present, not for a particular number, so >0 will match.
@@ -1659,7 +1661,7 @@
    {
    *VBUFF = '\0';
    ReadLine (line, CF_BUFSIZE - 1, pp);
-   Verbose ("PackageList: read line %s\n",line);
+   Debug("PackageList: read line %s\n",line);
    
    if( strlen(line) > 1 )
       {