fix bug in solvable_lookup_str_base

diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 032691684f67ed7ba105b1674884b3cedc9cea3d..912753f880f880b6ebad0b04ae9ae261342c91c4 100644 (file)
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 24 10:27:42 CEST 2009 - mls@suse.de
+
+- fix bug in solvable_lookup_str_base
+
 -------------------------------------------------------------------
 Wed Sep 23 11:10:08 CEST 2009 - mls@suse.de
 

diff --git a/src/solvable.c b/src/solvable.c
index 26caf77e4148ecf1d16d68fc75e8073701d46531..c7f71d8aa29ec2d1e27cf56b4204ebce0004aae7 100644 (file)
--- a/src/solvable.c
+++ b/src/solvable.c
@@ -73,7 +73,7 @@ solvable_lookup_str(Solvable *s, Id keyname)
   return repo_lookup_str(s->repo, s - s->repo->pool->solvables, keyname);
 }
 
-const char *
+static const char *
 solvable_lookup_str_base(Solvable *s, Id keyname, Id basekeyname)
 {
   Pool *pool;
@@ -94,7 +94,7 @@ solvable_lookup_str_base(Solvable *s, Id keyname, Id basekeyname)
   /* search for a solvable with same name and same base that has the
    * translation */
   if (!pool->whatprovides)
-    return 0;
+    return basestr;
   /* we do this in two passes, first same vendor, then all other vendors */
   for (pass = 0; pass < 2; pass++)
     {
@@ -113,7 +113,7 @@ solvable_lookup_str_base(Solvable *s, Id keyname, Id basekeyname)
            return str;
        }
     }
-  return 0;
+  return basestr;
 }
 
 const char *