Revision 304, the inclusion of Tim Cutts patch for breaking up package installs into chunks, lost the "inform" output from the package installer. His patch (against an older version) was fine, the lines:

-    while (!feof(pp))
-      {
-      ReadLine(line,CF_BUFSIZE-1,pp);
-      printf("%s:package install: %s\n",VPREFIX,line);
-      }

were replaced by:

+           while (!feof(pp))
+               {
+                   ReadLine(line,CF_BUFSIZE-1,pp);
+                   printf("%s:package install: %s\n",VPREFIX,line);
+               }

But when it was applied to trunk, the lines:

-while (!feof(pp))
-   {
-   ReadLine(line,CF_BUFSIZE-1,pp);
-   snprintf(OUTPUT,CF_BUFSIZE,"%s:package install: %s\n",VPREFIX,line);
-   CfLog(cfinform,OUTPUT,"");
-   }

were replaced by:

+      while (!feof(pp))
+         {
+         ReadLine(line,CF_BUFSIZE-1,pp);
+         snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line);
+         }

I believe we need to restore the `CfLog(cfinform,OUTPUT,"");' line for output. This was a useful patch, regardless, as frequently I do encounter very long package lines. Thanks to everyone involved.



Index: package.c
===================================================================
--- package.c   (revision 346)
+++ package.c   (working copy)
@@ -446,6 +446,7 @@
          {
          ReadLine(line,CF_BUFSIZE-1,pp);
          snprintf(OUTPUT,CF_BUFSIZE,"Package install: %s\n",line);
+         CfLog(cfinform,OUTPUT,"");
          }

       if (cfpclose(pp) != 0)




--
Eric Searcy
OSU Open Source Lab


Attachment: PGP.sig
Description: This is a digitally signed message part

_______________________________________________
Bug-cfengine mailing list
[email protected]
https://cfengine.org/mailman/listinfo/bug-cfengine

Reply via email to