projects
/
platform
/
upstream
/
libsolv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4d0e898
)
- initialize flags, change stripkind code
author
Michael Schroeder
<mls@suse.de>
Thu, 2 Jul 2009 13:09:42 +0000
(15:09 +0200)
committer
Michael Schroeder
<mls@suse.de>
Thu, 2 Jul 2009 13:09:42 +0000
(15:09 +0200)
src/repodata.c
patch
|
blob
|
history
diff --git
a/src/repodata.c
b/src/repodata.c
index
8672bba
..
89cd1c2
100644
(file)
--- a/
src/repodata.c
+++ b/
src/repodata.c
@@
-636,8
+636,10
@@
repodata_stringify(Pool *pool, Repodata *data, Repokey *key, KeyValue *kv, int f
kv->str = id2str(pool, kv->id);
if ((flags & SEARCH_SKIP_KIND) != 0 && key->storage == KEY_STORAGE_SOLVABLE)
{
kv->str = id2str(pool, kv->id);
if ((flags & SEARCH_SKIP_KIND) != 0 && key->storage == KEY_STORAGE_SOLVABLE)
{
- const char *s = strchr(kv->str, ':');
- if (s)
+ const char *s;
+ for (s = kv->str; *s >= 'a' && *s <= 'z'; s++)
+ ;
+ if (*s == ':' && s > kv->str)
kv->str = s + 1;
}
return 1;
kv->str = s + 1;
}
return 1;
@@
-968,6
+970,7
@@
dataiterator_init(Dataiterator *di, Pool *pool, Repo *repo, Id p, Id keyname, co
{
memset(di, 0, sizeof(*di));
di->pool = pool;
{
memset(di, 0, sizeof(*di));
di->pool = pool;
+ di->flags = flags & ~SEARCH_THISSOLVID;
if (!pool || (repo && repo->pool != pool))
{
di->state = di_bye;
if (!pool || (repo && repo->pool != pool))
{
di->state = di_bye;