2002-02-13 Havoc Pennington <hp@redhat.com>

Author: hp
Date: 2002-02-13 05:14:57 GMT
2002-02-13  Havoc Pennington  <hp@redhat.com>

	* pkg.c (internal_get_package): look up path position by package
	key, not package name

diff --git a/ChangeLog b/ChangeLog
index cc40b0f10709c6e77da848737e46e6d998a239df..c708c6b30ca53a42d66469dcb1dabbba90d1f529 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-13  Havoc Pennington  <hp@redhat.com>
+
+       * pkg.c (internal_get_package): look up path position by package
+       key, not package name
+
 2002-02-12  Havoc Pennington  <hp@redhat.com>
 
        * pkg.c (scan_dir): use g_strdup, and fix the location where 

diff --git a/pkg.c b/pkg.c
index c3f6e7272f89c997ad20239a2e7673f6e84e0e99..d071ff4e40689910375d5368e90a3f7809d00702 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -271,12 +271,6 @@ internal_get_package (const char *name, gboolean warn, gboolean check_compat)
       debug_spew ("Failed to parse '%s'\n", location);
       return NULL;
     }
-
-  pkg->path_position =
-    GPOINTER_TO_INT (g_hash_table_lookup (path_positions, pkg->name));
-
-  debug_spew ("Path position of '%s' is %d\n",
-              pkg->name, pkg->path_position);
   
   if (strstr (location, "uninstalled.pc"))
     pkg->uninstalled = TRUE;
@@ -298,6 +292,12 @@ internal_get_package (const char *name, gboolean warn, gboolean check_compat)
       pkg->key = g_strndup (start, end - start);
     }
 
+  pkg->path_position =
+    GPOINTER_TO_INT (g_hash_table_lookup (path_positions, pkg->key));
+
+  debug_spew ("Path position of '%s' is %d\n",
+              pkg->name, pkg->path_position);
+  
   verify_package (pkg);
 
   debug_spew ("Adding '%s' to list of known packages, returning as package '%s'\n",