summaryrefslogtreecommitdiff
path: root/src/database.c
diff options
context:
space:
mode:
authorDubiousjim <dubiousjim@gmail.com>2013-06-27 15:28:46 -0400
committerTimo Teräs <timo.teras@iki.fi>2013-06-28 13:45:41 +0300
commitac7616b0a9e4a4eaf640cd59a98cda01773c57ac (patch)
treee333508102823ac0621501f42524752d3a88e1de /src/database.c
parentfcb540ab6978d3d5a55f08120c78d8e03b1e13c7 (diff)
downloadapk-tools-ac7616b0a9e4a4eaf640cd59a98cda01773c57ac.tar.gz
apk-tools-ac7616b0a9e4a4eaf640cd59a98cda01773c57ac.tar.bz2
apk-tools-ac7616b0a9e4a4eaf640cd59a98cda01773c57ac.tar.xz
apk-tools-ac7616b0a9e4a4eaf640cd59a98cda01773c57ac.zip
various: applet help text and comment fixes
Acked-by: Natanael Copa <ncopa@alpinelinux.org>
Diffstat (limited to 'src/database.c')
-rw-r--r--src/database.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/database.c b/src/database.c
index d4becb9..33f7af8 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1119,12 +1119,10 @@ static int apk_db_read_state(struct apk_database *db, int flags)
int r;
/* Read:
- * 1. installed repository
- * 2. source repositories
- * 3. master dependencies
- * 4. package statuses
- * 5. files db
- * 6. script db
+ * 1. /etc/apk/world
+ * 2. installed packages db
+ * 3. triggers db
+ * 4. scripts db
*/
if (!(flags & APK_OPENF_NO_WORLD)) {
blob = world = apk_blob_from_file(db->root_fd, apk_world_file);
@@ -1574,14 +1572,14 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
db->cache_fd = fd;
if ((dbopts->open_flags & (APK_OPENF_WRITE | APK_OPENF_CACHE_WRITE)) &&
fstatvfs(fd, &stvfs) == 0 && (stvfs.f_flag & ST_RDONLY) != 0) {
- /* remount cache read-write */
+ /* remount cache read/write */
db->cache_remount_dir = find_mountpoint(db->root_fd, db->cache_dir);
if (db->cache_remount_dir == NULL) {
apk_warning("Unable to find cache directory mount point");
} else if (do_remount(db->cache_remount_dir, "rw") != 0) {
free(db->cache_remount_dir);
db->cache_remount_dir = NULL;
- apk_error("Unable to remount cache read-write");
+ apk_error("Unable to remount cache read/write");
r = EROFS;
goto ret_r;
}