diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-06-20 13:12:44 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-06-20 13:12:44 +0300 |
| commit | 7e18398781b056f858ef60200e24b0f8ab394cfe (patch) | |
| tree | 4323eed281a457910a1fffa63d5fb9a29d1f6735 /src/apk_package.h | |
| parent | 17145f82aeba9a9fdfdf03cb4f74cb41cf3ab913 (diff) | |
| download | apk-tools-7e18398781b056f858ef60200e24b0f8ab394cfe.tar.gz apk-tools-7e18398781b056f858ef60200e24b0f8ab394cfe.tar.bz2 apk-tools-7e18398781b056f858ef60200e24b0f8ab394cfe.tar.xz apk-tools-7e18398781b056f858ef60200e24b0f8ab394cfe.zip | |
commit, db: make file conflicts and script errors non-fatal
fixes #1482
Diffstat (limited to 'src/apk_package.h')
| -rw-r--r-- | src/apk_package.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/apk_package.h b/src/apk_package.h index 2d8a431..f743c3e 100644 --- a/src/apk_package.h +++ b/src/apk_package.h @@ -78,9 +78,6 @@ APK_ARRAY(apk_dependency_array, struct apk_dependency); struct apk_installed_package { struct apk_package *pkg; - unsigned int run_all_triggers : 1; - unsigned int repository_tag : 6; - unsigned short replaces_priority; struct list_head installed_pkgs_list; struct list_head trigger_pkgs_list; struct hlist_head owned_dirs; @@ -88,6 +85,12 @@ struct apk_installed_package { struct apk_string_array *triggers; struct apk_string_array *pending_triggers; struct apk_dependency_array *replaces; + + unsigned short replaces_priority; + unsigned repository_tag : 6; + unsigned run_all_triggers : 1; + unsigned broken_files : 1; + unsigned broken_script : 1; }; #define APK_PKG_UNINSTALLABLE ((char*) -1) @@ -177,9 +180,8 @@ void apk_pkg_uninstall(struct apk_database *db, struct apk_package *pkg); int apk_ipkg_add_script(struct apk_installed_package *ipkg, struct apk_istream *is, unsigned int type, unsigned int size); -int apk_ipkg_run_script(struct apk_installed_package *ipkg, - struct apk_database *db, - unsigned int type, char **argv); +void apk_ipkg_run_script(struct apk_installed_package *ipkg, struct apk_database *db, + unsigned int type, char **argv); struct apk_package *apk_pkg_parse_index_entry(struct apk_database *db, apk_blob_t entry); int apk_pkg_write_index_entry(struct apk_package *pkg, struct apk_ostream *os); |