2002-10-02 Anders Carlsson <andersca@gnu.org>

Author: andersca
Date: 2002-10-02 09:10:10 GMT
2002-10-02  Anders Carlsson  <andersca@gnu.org>

	* pkg.c (add_env_variable_to_list): Don't return NULL, return
	the new list.
	(verify_package): break if we've removed the variable.

diff --git a/ChangeLog b/ChangeLog
index 8e75d8c6f9229ad32e55c1a563b47679290848b4..e8fea93dbc336803160009518d5171c4df75bfb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-02  Anders Carlsson  <andersca@gnu.org>
+
+       * pkg.c (add_env_variable_to_list): Don't return NULL, return
+       the new list.
+       (verify_package): break if we've removed the variable.
+
 2002-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * parse.c (get_compat_package): Return NULL right away on

diff --git a/pkg.c b/pkg.c
index b9e570732bbeb2d46493e58d8f5b7bec0e4a361c..66e1e8e6951a20df994bcf8f03ce7154d1c68481 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -656,7 +656,7 @@ add_env_variable_to_list (GSList *list, const gchar *env)
     }
   g_strfreev (values);
 
-  return NULL;
+  return list;
 }
 
 static void
@@ -822,6 +822,8 @@ verify_package (Package *pkg)
                      debug_spew ("Removing %s from cflags for %s\n", iter->data, pkg->key);
                      ++count;
                      iter->data = NULL;
+                     
+                     break;
                    }
                }
              system_dir_iter = system_dir_iter->next;