ref: refs/heads/master
commit 261561e913eb73912d5708eb92ed3073db2f947d
Author: Michael Schroeder
Date: Thu Sep 24 10:27:53 2009 +0200
fix bug in solvable_lookup_str_base
---
package/libsatsolver.changes | 5 +++++
src/solvable.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 0326916..912753f 100644
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+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
- get missing translations from other solvables [bnc#386449]
diff --git a/src/solvable.c b/src/solvable.c
index 26caf77..c7f71d8 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 *
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
