diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-01-30 14:40:00 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-01-30 14:40:00 +0200 |
| commit | cd6786bc30ef4e6443dd45604863c9619a346681 (patch) | |
| tree | b7f8e6a7a3a9afa060f3c9f7af1e4160009f896a | |
| parent | c553970061a61f4a6c62b8cf949f1012259854e6 (diff) | |
always save 'world' with line feeds
using space was for backwards compatibility with apk-tools 2.2.2
and earlier (from January 2012)
| -rw-r--r-- | src/apk_database.h | 1 | ||||
| -rw-r--r-- | src/database.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/apk_database.h b/src/apk_database.h index 089cdd8..880809b 100644 --- a/src/apk_database.h +++ b/src/apk_database.h @@ -152,7 +152,6 @@ struct apk_database { int permanent : 1; int compat_newfeatures : 1; int compat_notinstallable : 1; - int compat_old_world : 1; struct apk_dependency_array *world; struct apk_protected_path_array *protected_paths; diff --git a/src/database.c b/src/database.c index 5df3c68..09454c1 100644 --- a/src/database.c +++ b/src/database.c @@ -1113,8 +1113,6 @@ static int apk_db_read_state(struct apk_database *db, int flags) if (APK_BLOB_IS_NULL(blob)) return -ENOENT; blob = apk_blob_trim(blob); - if (apk_blob_chr(blob, ' ')) - db->compat_old_world = 1; apk_blob_pull_deps(&blob, db, &db->world); free(world.ptr); } @@ -1653,7 +1651,7 @@ int apk_db_write_config(struct apk_database *db) if (os == NULL) return -1; - apk_deps_write(db, db->world, os, APK_BLOB_PTR_LEN(db->compat_old_world ? " " : "\n", 1)); + apk_deps_write(db, db->world, os, APK_BLOB_PTR_LEN("\n", 1)); os->write(os, "\n", 1); r = os->close(os); if (r < 0) |