diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-27 14:54:40 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-27 14:54:40 +0900 |
| commit | 70c6207bfdb27f170377015f65f22e8ba50f6a10 (patch) | |
| tree | c7de4059dfc4518bbbf5c3b8a5925f441487b743 /ext | |
| parent | 9d82811ac90c5db61fca60e3e7c95ba58bc66393 (diff) | |
| download | libsolv-70c6207bfdb27f170377015f65f22e8ba50f6a10.tar.gz libsolv-70c6207bfdb27f170377015f65f22e8ba50f6a10.tar.bz2 libsolv-70c6207bfdb27f170377015f65f22e8ba50f6a10.zip | |
Imported Upstream version 0.6.13upstream/0.6.13
Change-Id: I9fed388d0b8658275d9089b22473596379566069
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/repo_autopattern.c | 9 | ||||
| -rw-r--r-- | ext/repo_mdk.c | 2 | ||||
| -rw-r--r-- | ext/testcase.c | 25 |
3 files changed, 22 insertions, 14 deletions
diff --git a/ext/repo_autopattern.c b/ext/repo_autopattern.c index 7edfc6c..4c767e1 100644 --- a/ext/repo_autopattern.c +++ b/ext/repo_autopattern.c @@ -265,8 +265,13 @@ repo_add_autopattern(Repo *repo, int flags) repodata_set_str(data, s2 - pool->solvables, SOLVABLE_ICON, newname); else if (!strcmp(pn, "pattern-order()") && evr) repodata_set_str(data, s2 - pool->solvables, SOLVABLE_ORDER, newname); - else if (!strcmp(pn, "pattern-visible()") && !evr) - repodata_set_void(data, s2 - pool->solvables, SOLVABLE_ISVISIBLE); + else if (!strcmp(pn, "pattern-visible()")) + { + if (!evr) + repodata_set_void(data, s2 - pool->solvables, SOLVABLE_ISVISIBLE); + else + repodata_set_str(data, s2 - pool->solvables, SOLVABLE_ISVISIBLE, newname); + } } } queue_free(&patq); diff --git a/ext/repo_mdk.c b/ext/repo_mdk.c index 3d0a91d..345d416 100644 --- a/ext/repo_mdk.c +++ b/ext/repo_mdk.c @@ -123,6 +123,8 @@ repo_add_mdk(Repo *repo, FILE *fp, int flags) s->provides = parse_deps(s, buf + 10, 0); else if (!strncmp(buf + 1, "requires@", 9)) s->requires = parse_deps(s, buf + 10, SOLVABLE_PREREQMARKER); + else if (!strncmp(buf + 1, "recommends@", 11)) + s->recommends = parse_deps(s, buf + 10, 0); else if (!strncmp(buf + 1, "suggests@", 9)) s->suggests = parse_deps(s, buf + 10, 0); else if (!strncmp(buf + 1, "obsoletes@", 10)) diff --git a/ext/testcase.c b/ext/testcase.c index e4346fe..3c40451 100644 --- a/ext/testcase.c +++ b/ext/testcase.c @@ -33,18 +33,19 @@ static struct job2str { Id job; const char *str; } job2str[] = { - { SOLVER_NOOP, "noop" }, - { SOLVER_INSTALL, "install" }, - { SOLVER_ERASE, "erase" }, - { SOLVER_UPDATE, "update" }, - { SOLVER_WEAKENDEPS, "weakendeps" }, - { SOLVER_MULTIVERSION, "multiversion" }, - { SOLVER_MULTIVERSION, "noobsoletes" }, /* old name */ - { SOLVER_LOCK, "lock" }, - { SOLVER_DISTUPGRADE, "distupgrade" }, - { SOLVER_VERIFY, "verify" }, - { SOLVER_DROP_ORPHANED, "droporphaned" }, - { SOLVER_USERINSTALLED, "userinstalled" }, + { SOLVER_NOOP, "noop" }, + { SOLVER_INSTALL, "install" }, + { SOLVER_ERASE, "erase" }, + { SOLVER_UPDATE, "update" }, + { SOLVER_WEAKENDEPS, "weakendeps" }, + { SOLVER_MULTIVERSION, "multiversion" }, + { SOLVER_MULTIVERSION, "noobsoletes" }, /* old name */ + { SOLVER_LOCK, "lock" }, + { SOLVER_DISTUPGRADE, "distupgrade" }, + { SOLVER_VERIFY, "verify" }, + { SOLVER_DROP_ORPHANED, "droporphaned" }, + { SOLVER_USERINSTALLED, "userinstalled" }, + { SOLVER_ALLOWUNINSTALL, "allowuninstall" }, { 0, 0 } }; |