summaryrefslogtreecommitdiffstats
path: root/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-04-14 11:35:01 +0300
committerTimo Teräs <timo.teras@iki.fi>2014-04-14 11:35:01 +0300
commitbc34c5b0d02dd4fee19d2a1b8abc3efde0b41e51 (patch)
treefc2e9575d08b43720520d33be9ff981548765a05 /main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch
parent83c487151531561185856b590e54b4557e2ef76c (diff)
downloadaports-bc34c5b0d02dd4fee19d2a1b8abc3efde0b41e51.tar.bz2
aports-bc34c5b0d02dd4fee19d2a1b8abc3efde0b41e51.tar.xz
main/apk-tools: delete unneeded files
Diffstat (limited to 'main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch')
-rw-r--r--main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch b/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch
deleted file mode 100644
index 6f3ca6626..000000000
--- a/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9fa64ca1db84c7a57434498651218d02da57ca04 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 10 Apr 2014 09:52:40 +0300
-Subject: [PATCH] solver: fix cleaning of packages that got replaced by
- provides
-
----
- src/solver.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/solver.c b/src/solver.c
-index 31b3db7..9c513c7 100644
---- a/src/solver.c
-+++ b/src/solver.c
-@@ -786,10 +786,13 @@ static void cset_gen_name_remove(struct apk_solver_state *ss, struct apk_package
- {
- struct apk_name *name = pkg->name, **pname;
-
-- if (name->ss.chosen.pkg != NULL || name->ss.in_changeset)
-+ if (pkg->ss.in_changeset ||
-+ (name->ss.chosen.pkg != NULL &&
-+ name->ss.chosen.pkg->name == name))
- return;
-
- name->ss.in_changeset = 1;
-+ pkg->ss.in_changeset = 1;
- foreach_array_item(pname, pkg->name->rinstall_if)
- cset_check_removal_by_iif(ss, *pname);
- record_change(ss, pkg, NULL);
---
-1.9.1
-