From: Michael Schroeder <mls@suse.de>
Date: Thu, 24 Sep 2009 08:27:53 +0000 (+0200)
Subject: fix bug in solvable_lookup_str_base
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~161^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5bb5e7e64fd2c3e361fcc4ae919bb359256f781;p=thirdparty%2Flibsolv.git

fix bug in solvable_lookup_str_base
---

diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 03269168..912753f8 100644
--- 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 26caf77e..c7f71d8a 100644
--- 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 *