diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-16 10:04:39 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-06-16 10:08:08 +0000 |
commit | 560f1539d7c8560e389c9289d9db7986adaa7bb0 (patch) | |
tree | ed1eb8a810c690f7ba686513ccce3b842f818fc5 | |
parent | 99c3764deae9f493e6e1ac91442e84c5519126db (diff) | |
download | alpine_aports-560f1539d7c8560e389c9289d9db7986adaa7bb0.tar.bz2 alpine_aports-560f1539d7c8560e389c9289d9db7986adaa7bb0.tar.xz alpine_aports-560f1539d7c8560e389c9289d9db7986adaa7bb0.zip |
main/apk-tools: removed unused patch
(cherry picked from commit 403fea254a753e28c7a9580517a6cad1980e339f)
-rw-r--r-- | main/apk-tools/triggers.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/main/apk-tools/triggers.patch b/main/apk-tools/triggers.patch deleted file mode 100644 index 4702e0f85a..0000000000 --- a/main/apk-tools/triggers.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | commit 60b537e356dfcd0ed9a3516152c6a170912efcef | ||
2 | Author: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Thu Jun 10 17:50:11 2010 +0000 | ||
4 | |||
5 | db: do not free trigger list after package is unpacked | ||
6 | |||
7 | The triggers are read during apk_db_unpack_pkg(). If we delete the | ||
8 | triggers list after then unpack we delete the triggers which is not | ||
9 | what we want. | ||
10 | |||
11 | This fixes bug introduced in ce3cf8bff901e7fcacbca640ffedaeea2b3bdf7f | ||
12 | |||
13 | diff --git a/src/database.c b/src/database.c | ||
14 | index 7421e1b..11864cb 100644 | ||
15 | --- a/src/database.c | ||
16 | +++ b/src/database.c | ||
17 | @@ -2100,6 +2100,12 @@ int apk_db_install_pkg(struct apk_database *db, | ||
18 | |||
19 | /* Install the new stuff */ | ||
20 | ipkg = apk_pkg_install(db, newpkg); | ||
21 | + ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS; | ||
22 | + if (ipkg->triggers->num != 0) { | ||
23 | + list_del(&ipkg->trigger_pkgs_list); | ||
24 | + apk_string_array_free(&ipkg->triggers); | ||
25 | + } | ||
26 | + | ||
27 | if (newpkg->installed_size != 0) { | ||
28 | r = apk_db_unpack_pkg(db, ipkg, (oldpkg != NULL), | ||
29 | (oldpkg == newpkg), cb, cb_ctx, | ||
30 | @@ -2110,12 +2116,6 @@ int apk_db_install_pkg(struct apk_database *db, | ||
31 | } | ||
32 | } | ||
33 | |||
34 | - ipkg->flags |= APK_IPKGF_RUN_ALL_TRIGGERS; | ||
35 | - if (ipkg->triggers->num != 0) { | ||
36 | - list_del(&ipkg->trigger_pkgs_list); | ||
37 | - apk_string_array_free(&ipkg->triggers); | ||
38 | - } | ||
39 | - | ||
40 | if (oldpkg != NULL && oldpkg != newpkg && oldpkg->ipkg != NULL) { | ||
41 | apk_db_purge_pkg(db, oldpkg->ipkg, NULL); | ||
42 | apk_pkg_uninstall(db, oldpkg); | ||