summaryrefslogtreecommitdiff
path: root/src/commit.c
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-05-19 11:50:10 +0300
committerTimo Teräs <timo.teras@iki.fi>2014-05-19 11:50:10 +0300
commit1dc70477b5e9b07808001093ec33d2530d1799e1 (patch)
treec725ea0196c7a4834da5fa73d164bd96acc3eeee /src/commit.c
parent7e64edfad62da8e180f660820bfa7a2fc321a72a (diff)
downloadapk-tools-1dc70477b5e9b07808001093ec33d2530d1799e1.tar.gz
apk-tools-1dc70477b5e9b07808001093ec33d2530d1799e1.tar.bz2
apk-tools-1dc70477b5e9b07808001093ec33d2530d1799e1.tar.xz
apk-tools-1dc70477b5e9b07808001093ec33d2530d1799e1.zip
solver: fix installation of non-repository packages during tmpfs boot
allow packages in the cache's installed to be selected for installation by the solver. add test case for the issue.
Diffstat (limited to 'src/commit.c')
-rw-r--r--src/commit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/commit.c b/src/commit.c
index 8766cc8..bf3b4a2 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -379,6 +379,9 @@ static void print_pinning_errors(struct print_state *ps, struct apk_package *pkg
if (!(pkg->repos & db->available_repos)) {
label_start(ps, "masked in:");
apk_print_indented_fmt(&ps->i, "--no-network");
+ } else if (pkg->repos == BIT(APK_REPOSITORY_CACHED)) {
+ label_start(ps, "masked in:");
+ apk_print_indented_fmt(&ps->i, "cache");
} else {
if (pkg->repos & apk_db_get_pinning_mask_repos(db, APK_DEFAULT_PINNING_MASK | BIT(tag)))
return;