diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2020-11-27 14:49:41 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2020-11-27 14:49:41 +0900 |
| commit | 99023ce80ad7daa0f6462861dac71e17aac694b8 (patch) | |
| tree | 0df34c5c104209ad692e46fe842395cc35436aea /ext | |
| parent | b712cabb59f7155205489f15a37addb4ac8b0069 (diff) | |
| download | libsolv-99023ce80ad7daa0f6462861dac71e17aac694b8.tar.gz libsolv-99023ce80ad7daa0f6462861dac71e17aac694b8.tar.bz2 libsolv-99023ce80ad7daa0f6462861dac71e17aac694b8.zip | |
Imported Upstream version 0.7.16upstream/0.7.16
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/testcase.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ext/testcase.c b/ext/testcase.c index bbed5ab..0be7a21 100644 --- a/ext/testcase.c +++ b/ext/testcase.c @@ -1711,7 +1711,7 @@ testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const cha for (rid = 1; rid < pool->nrels; rid++) { Reldep *rd = pool->rels + rid; - if (rd->flags != REL_NAMESPACE || rd->name == NAMESPACE_OTHERPROVIDERS) + if (rd->flags != REL_NAMESPACE || rd->name == NAMESPACE_OTHERPROVIDERS || rd->name == NAMESPACE_SPLITPROVIDES) continue; /* evaluate all namespace ids, skip empty results */ d = pool_whatprovides(pool, MAKERELDEP(rid)); @@ -1826,14 +1826,12 @@ testcase_mangle_repo_names(Pool *pool) for (mp = buf; *mp; mp++) if (*mp == ' ' || *mp == '\t' || *mp == '/') *mp = '_'; - for (;;) - { - for (i = 1; i < repoid; i++) - if (!strcmp(buf, names[i])) - break; - if (i == repoid) - break; + for (i = 1; i < repoid; i++) + { + if (!names[i] || strcmp(buf, names[i]) != 0) + continue; sprintf(mp, "_%d", mangle++); + i = 0; /* restart conflict check */ } names[repoid] = buf; } |