diff options
author | Timo Teräs <timo.teras@iki.fi> | 2014-04-14 11:35:01 +0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2014-04-14 11:35:01 +0300 |
commit | bc34c5b0d02dd4fee19d2a1b8abc3efde0b41e51 (patch) | |
tree | fc2e9575d08b43720520d33be9ff981548765a05 | |
parent | 83c487151531561185856b590e54b4557e2ef76c (diff) | |
download | alpine_aports-bc34c5b0d02dd4fee19d2a1b8abc3efde0b41e51.tar.bz2 alpine_aports-bc34c5b0d02dd4fee19d2a1b8abc3efde0b41e51.tar.xz alpine_aports-bc34c5b0d02dd4fee19d2a1b8abc3efde0b41e51.zip |
main/apk-tools: delete unneeded files
-rw-r--r-- | main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch | 32 | ||||
-rw-r--r-- | main/apk-tools/0001-solver-purge-install_if-packages-deleted-from-reposi.patch | 42 |
2 files changed, 0 insertions, 74 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 6f3ca66260..0000000000 --- a/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 9fa64ca1db84c7a57434498651218d02da57ca04 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Thu, 10 Apr 2014 09:52:40 +0300 | ||
4 | Subject: [PATCH] solver: fix cleaning of packages that got replaced by | ||
5 | provides | ||
6 | |||
7 | --- | ||
8 | src/solver.c | 5 ++++- | ||
9 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/src/solver.c b/src/solver.c | ||
12 | index 31b3db7..9c513c7 100644 | ||
13 | --- a/src/solver.c | ||
14 | +++ b/src/solver.c | ||
15 | @@ -786,10 +786,13 @@ static void cset_gen_name_remove(struct apk_solver_state *ss, struct apk_package | ||
16 | { | ||
17 | struct apk_name *name = pkg->name, **pname; | ||
18 | |||
19 | - if (name->ss.chosen.pkg != NULL || name->ss.in_changeset) | ||
20 | + if (pkg->ss.in_changeset || | ||
21 | + (name->ss.chosen.pkg != NULL && | ||
22 | + name->ss.chosen.pkg->name == name)) | ||
23 | return; | ||
24 | |||
25 | name->ss.in_changeset = 1; | ||
26 | + pkg->ss.in_changeset = 1; | ||
27 | foreach_array_item(pname, pkg->name->rinstall_if) | ||
28 | cset_check_removal_by_iif(ss, *pname); | ||
29 | record_change(ss, pkg, NULL); | ||
30 | -- | ||
31 | 1.9.1 | ||
32 | |||
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 @@ | |||
1 | From c35086dc927372bcbb260f0ef4b06eca38d9fdc4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Thu, 10 Apr 2014 11:10:12 +0300 | ||
4 | Subject: [PATCH] solver: purge install_if packages deleted from repositories | ||
5 | on upgrade -a | ||
6 | |||
7 | --- | ||
8 | src/solver.c | 11 +++++++++-- | ||
9 | 1 file changed, 9 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/src/solver.c b/src/solver.c | ||
12 | index 9c513c7..2b35924 100644 | ||
13 | --- a/src/solver.c | ||
14 | +++ b/src/solver.c | ||
15 | @@ -187,8 +187,6 @@ static void discover_name(struct apk_solver_state *ss, struct apk_name *name) | ||
16 | continue; | ||
17 | |||
18 | pkg->ss.seen = 1; | ||
19 | - pkg->ss.iif_failed = (pkg->install_if->num == 0); | ||
20 | - name->ss.no_iif &= pkg->ss.iif_failed; | ||
21 | |||
22 | pkg->ss.pinning_allowed = APK_DEFAULT_PINNING_MASK; | ||
23 | pkg->ss.pinning_preferred = APK_DEFAULT_PINNING_MASK; | ||
24 | @@ -201,6 +199,15 @@ static void discover_name(struct apk_solver_state *ss, struct apk_name *name) | ||
25 | (pkg->repos & db->available_repos) || | ||
26 | pkg->ipkg; | ||
27 | |||
28 | + /* Prune install_if packages that are no longer available, | ||
29 | + * currently works only if SOLVERF_AVAILABLE is set in the | ||
30 | + * global solver flags. */ | ||
31 | + pkg->ss.iif_failed = | ||
32 | + (pkg->install_if->num == 0) || | ||
33 | + ((ss->solver_flags_inherit & APK_SOLVERF_AVAILABLE) && | ||
34 | + !pkg->ss.pkg_available); | ||
35 | + name->ss.no_iif &= pkg->ss.iif_failed; | ||
36 | + | ||
37 | repos = get_pkg_repos(db, pkg); | ||
38 | pkg->ss.tag_preferred = | ||
39 | (pkg->filename != NULL) || | ||
40 | -- | ||
41 | 1.9.1 | ||
42 | |||