diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2018-01-03 15:17:11 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2018-01-03 16:00:38 +0200 |
| commit | 039ff3bd466819909a5295a43e40947a9e0b6c16 (patch) | |
| tree | 1f22b1a16dd752e48142a0c5aff0697fb100ea78 /src/commit.c | |
| parent | f90af35e9c563bd4f865d8d47a7ae357191494db (diff) | |
| download | apk-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/commit.c')
| -rw-r--r-- | src/commit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/commit.c b/src/commit.c index af49f5c..e82537f 100644 --- a/src/commit.c +++ b/src/commit.c @@ -266,7 +266,8 @@ int apk_solver_commit_changeset(struct apk_database *db, int r, errors = 0; if (apk_db_check_world(db, world) != 0) { - apk_error("Not committing changes due to missing repository tags. Use --force to override."); + apk_error("Not committing changes due to missing repository tags. " + "Use --force-broken-world to override."); return -1; } @@ -675,7 +676,8 @@ int apk_solver_commit(struct apk_database *db, int r; if (apk_db_check_world(db, world) != 0) { - apk_error("Not committing changes due to missing repository tags. Use --force to override."); + apk_error("Not committing changes due to missing repository tags. " + "Use --force-broken-world to override."); return -1; } |