summaryrefslogtreecommitdiff
path: root/src/add.c
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-01-03 15:17:11 +0200
committerTimo Teräs <timo.teras@iki.fi>2018-01-03 16:00:38 +0200
commit039ff3bd466819909a5295a43e40947a9e0b6c16 (patch)
tree1f22b1a16dd752e48142a0c5aff0697fb100ea78 /src/add.c
parentf90af35e9c563bd4f865d8d47a7ae357191494db (diff)
downloadapk-tools-039ff3bd466819909a5295a43e40947a9e0b6c16.tar.gz
apk-tools-039ff3bd466819909a5295a43e40947a9e0b6c16.tar.bz2
apk-tools-039ff3bd466819909a5295a43e40947a9e0b6c16.tar.xz
apk-tools-039ff3bd466819909a5295a43e40947a9e0b6c16.zip
split --force to several --force-[type] options
This unloads --force as several of the things are really not wanted together. E.g. --force-refresh is a lot different from --force-broken-world and doing --force to get the other might introduce unwanted behaviour. --force is still kept for backwards compatibility and it enables most things --force was used for.
Diffstat (limited to 'src/add.c')
-rw-r--r--src/add.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/add.c b/src/add.c
index 742df07..dcaa45c 100644
--- a/src/add.c
+++ b/src/add.c
@@ -60,7 +60,7 @@ static const struct apk_option_group optgroup_applet = {
static int non_repository_check(struct apk_database *db)
{
- if (apk_flags & APK_FORCE)
+ if (apk_force & APK_FORCE_NON_REPOSITORY)
return 0;
if (apk_db_cache_active(db))
return 0;
@@ -69,8 +69,8 @@ static int non_repository_check(struct apk_database *db)
apk_error("You tried to add a non-repository package to system, "
"but it would be lost on next reboot. Enable package caching "
- "(apk cache --help) or use --force if you know what you are "
- "doing.");
+ "(apk cache --help) or use --force-non-repository "
+ "if you know what you are doing.");
return 1;
}