[Openvas-commits] r5767 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-31 13:34:36 +0100 (Sat, 31 Oct 2009)
New Revision: 5767

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/lsc_user.c
Log:
	* src/lsc_user.c (file_utils_copy_file): Correct check of
	g_file_get_contents return.
	(lsc_user_rpm_create): Rename oltap_path to generator_path.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-10-31 12:24:37 UTC (rev 5766)
+++ trunk/openvas-manager/ChangeLog	2009-10-31 12:34:36 UTC (rev 5767)
@@ -1,5 +1,11 @@
-2009-10-30  Matthew Mundell <matthew.mundell at intevation.de>
+2009-10-31  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/lsc_user.c (file_utils_copy_file): Correct check of
+	g_file_get_contents return.
+	(lsc_user_rpm_create): Rename oltap_path to generator_path.
+
+2009-10-31  Matthew Mundell <matthew.mundell at intevation.de>
+
 	Add database migration from version 4 to 5.
 
 	* src/tasks_sql.h: Move database column definitions up in file.

Modified: trunk/openvas-manager/src/lsc_user.c
===================================================================
--- trunk/openvas-manager/src/lsc_user.c	2009-10-31 12:24:37 UTC (rev 5766)
+++ trunk/openvas-manager/src/lsc_user.c	2009-10-31 12:34:36 UTC (rev 5767)
@@ -192,7 +192,8 @@
   if (g_file_get_contents (source_file,
                            &src_file_content,
                            &src_file_size,
-                           &error))
+                           &error)
+      == FALSE)
     {
       if (error)
         {
@@ -512,7 +513,7 @@
                      const gchar *public_key_path,
                      const gchar *to_filename)
 {
-  const gchar *oltap_path;
+  const gchar *generator_path;
   gchar *rpm_path = NULL;
   gint exit_status;
   gchar *new_pubkey_filename = NULL;
@@ -524,7 +525,7 @@
   gchar *standard_err;
   gchar *rpmfile;
 
-  oltap_path = get_rpm_generator_path ();
+  generator_path = get_rpm_generator_path ();
 
   /* Create a temporary directory. */
 
@@ -559,8 +560,8 @@
   cmd[3] = g_build_filename (tmpdir, pubkey_basename, NULL);
   cmd[4] = NULL;
   g_debug ("%s: Spawning in %s: %s %s %s %s\n",
-           __FUNCTION__, oltap_path, cmd[0], cmd[1], cmd[2], cmd[3]);
-  if ((g_spawn_sync (oltap_path,
+           __FUNCTION__, generator_path, cmd[0], cmd[1], cmd[2], cmd[3]);
+  if ((g_spawn_sync (generator_path,
                      cmd,
                      NULL,                  /* Environment. */
                      G_SPAWN_SEARCH_PATH,