summaryrefslogtreecommitdiff
path: root/src/apk_package.h
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-06-20 14:08:16 +0300
committerTimo Teräs <timo.teras@iki.fi>2013-06-20 14:08:16 +0300
commit3f27da2adec968b1d8f83149b2b321e1050b4acb (patch)
treefe66fec31a9eb8a6541075ef3f8e307d2e99d957 /src/apk_package.h
parent7e18398781b056f858ef60200e24b0f8ab394cfe (diff)
downloadapk-tools-3f27da2adec968b1d8f83149b2b321e1050b4acb.tar.gz
apk-tools-3f27da2adec968b1d8f83149b2b321e1050b4acb.tar.bz2
apk-tools-3f27da2adec968b1d8f83149b2b321e1050b4acb.tar.xz
apk-tools-3f27da2adec968b1d8f83149b2b321e1050b4acb.zip
solver: fix pinning+cache to work
Mistakenly allowed masked out package to be installed if it was in cache.
Diffstat (limited to 'src/apk_package.h')
-rw-r--r--src/apk_package.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/apk_package.h b/src/apk_package.h
index f743c3e..8945cd8 100644
--- a/src/apk_package.h
+++ b/src/apk_package.h
@@ -93,8 +93,6 @@ struct apk_installed_package {
unsigned broken_script : 1;
};
-#define APK_PKG_UNINSTALLABLE ((char*) -1)
-
struct apk_package {
apk_hash_node hash_node;
union {
@@ -117,6 +115,7 @@ struct apk_package {
size_t installed_size, size;
time_t build_time;
unsigned marked : 1;
+ unsigned uninstallable : 1;
unsigned repos : APK_MAX_REPOS;
struct apk_checksum csum;
};