Commit c4960a1a authored by Timo Teräs's avatar Timo Teräs
Browse files

allow virtual packages beginning with dot by default on tmpfs installs

the allows update-kernel script to work on tmpfs install before
cache is configured.
parent fd98e9c7
...@@ -88,9 +88,6 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array ...@@ -88,9 +88,6 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array
if (actx->virtpkg) { if (actx->virtpkg) {
apk_blob_t b = APK_BLOB_STR(actx->virtpkg); apk_blob_t b = APK_BLOB_STR(actx->virtpkg);
if (non_repository_check(db))
return -1;
apk_blob_pull_dep(&b, db, &virtdep); apk_blob_pull_dep(&b, db, &virtdep);
if (APK_BLOB_IS_NULL(b) || virtdep.conflict || if (APK_BLOB_IS_NULL(b) || virtdep.conflict ||
virtdep.result_mask != APK_DEPMASK_ANY || virtdep.result_mask != APK_DEPMASK_ANY ||
...@@ -99,6 +96,9 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array ...@@ -99,6 +96,9 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array
return -1; return -1;
} }
if (virtdep.name->name[0] != '.' && non_repository_check(db))
return -1;
virtpkg = apk_pkg_new(); virtpkg = apk_pkg_new();
if (virtpkg == NULL) { if (virtpkg == NULL) {
apk_error("Failed to allocate virtual meta package"); apk_error("Failed to allocate virtual meta package");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment