diff options
Diffstat (limited to 'main/apk-tools/0001-solver-purge-install_if-packages-deleted-from-reposi.patch')
| -rw-r--r-- | main/apk-tools/0001-solver-purge-install_if-packages-deleted-from-reposi.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/main/apk-tools/0001-solver-purge-install_if-packages-deleted-from-reposi.patch b/main/apk-tools/0001-solver-purge-install_if-packages-deleted-from-reposi.patch deleted file mode 100644 index 42b97988f0..0000000000 --- a/main/apk-tools/0001-solver-purge-install_if-packages-deleted-from-reposi.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c35086dc927372bcbb260f0ef4b06eca38d9fdc4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Thu, 10 Apr 2014 11:10:12 +0300 -Subject: [PATCH] solver: purge install_if packages deleted from repositories - on upgrade -a - ---- - src/solver.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/solver.c b/src/solver.c -index 9c513c7..2b35924 100644 ---- a/src/solver.c -+++ b/src/solver.c -@@ -187,8 +187,6 @@ static void discover_name(struct apk_solver_state *ss, struct apk_name *name) - continue; - - pkg->ss.seen = 1; -- pkg->ss.iif_failed = (pkg->install_if->num == 0); -- name->ss.no_iif &= pkg->ss.iif_failed; - - pkg->ss.pinning_allowed = APK_DEFAULT_PINNING_MASK; - pkg->ss.pinning_preferred = APK_DEFAULT_PINNING_MASK; -@@ -201,6 +199,15 @@ static void discover_name(struct apk_solver_state *ss, struct apk_name *name) - (pkg->repos & db->available_repos) || - pkg->ipkg; - -+ /* Prune install_if packages that are no longer available, -+ * currently works only if SOLVERF_AVAILABLE is set in the -+ * global solver flags. */ -+ pkg->ss.iif_failed = -+ (pkg->install_if->num == 0) || -+ ((ss->solver_flags_inherit & APK_SOLVERF_AVAILABLE) && -+ !pkg->ss.pkg_available); -+ name->ss.no_iif &= pkg->ss.iif_failed; -+ - repos = get_pkg_repos(db, pkg); - pkg->ss.tag_preferred = - (pkg->filename != NULL) || --- -1.9.1 - |