diff options
| -rw-r--r-- | src/add.c | 5 | ||||
| -rw-r--r-- | src/apk.c | 2 | ||||
| -rw-r--r-- | src/apk_package.h | 2 | ||||
| -rw-r--r-- | src/archive.c | 2 | ||||
| -rw-r--r-- | src/database.c | 14 | ||||
| -rw-r--r-- | src/dot.c | 2 | ||||
| -rw-r--r-- | src/fetch.c | 2 | ||||
| -rw-r--r-- | src/index.c | 2 | ||||
| -rw-r--r-- | src/info.c | 4 | ||||
| -rw-r--r-- | src/lua-apk.c | 2 | ||||
| -rw-r--r-- | src/search.c | 2 | ||||
| -rw-r--r-- | src/ver.c | 4 |
12 files changed, 21 insertions, 22 deletions
@@ -154,14 +154,15 @@ static struct apk_option add_options[] = { { 'u', "upgrade", "Prefer to upgrade package" }, { 't', "virtual", "Instead of adding all the packages to 'world', create a new virtual " - "package with the listed dependencies and add that to 'world'. The " + "package with the listed dependencies and add that to 'world'; the " "actions of the command are easily reverted by deleting the virtual " "package", required_argument, "NAME" }, }; static struct apk_applet apk_add = { .name = "add", - .help = "Add/update PACKAGEs to main dependencies and install them", + .help = "Add PACKAGEs to main dependencies and install (or upgrade) " + "them, while ensuring that all dependencies are met", .arguments = "PACKAGE...", .open_flags = APK_OPENF_WRITE, .context_size = sizeof(struct add_ctx), @@ -42,7 +42,7 @@ static struct apk_option generic_options[] = { { 'X', "repository", "Use packages from REPO", required_argument, "REPO" }, { 'q', "quiet", "Print less information" }, - { 'v', "verbose", "Print more information" }, + { 'v', "verbose", "Print more information (can be doubled)" }, { 'i', "interactive", "Ask confirmation for certain operations" }, { 'V', "version", "Print program version and exit" }, { 'f', "force", "Do what was asked even if it looks dangerous" }, diff --git a/src/apk_package.h b/src/apk_package.h index 8945cd8..0d61e23 100644 --- a/src/apk_package.h +++ b/src/apk_package.h @@ -1,4 +1,4 @@ -/* apk_database.h - Alpine Package Keeper (APK) +/* apk_package.h - Alpine Package Keeper (APK) * * Copyright (C) 2005-2008 Natanael Copa <n@tanael.org> * Copyright (C) 2008-2011 Timo Teräs <timo.teras@iki.fi> diff --git a/src/archive.c b/src/archive.c index 8f22f42..771e548 100644 --- a/src/archive.c +++ b/src/archive.c @@ -45,7 +45,7 @@ struct tar_header { char devmajor[8]; /* 329-336 */ char devminor[8]; /* 337-344 */ char prefix[155]; /* 345-499 */ - char padding[12]; /* 500-512 */ + char padding[12]; /* 500-511 */ }; struct apk_tar_digest_info { 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; } @@ -157,7 +157,7 @@ static int dot_main(void *pctx, struct apk_database *db, struct apk_string_array static struct apk_option dot_options[] = { { 0x10000, "errors", "Output only parts of the graph which are considered " - "errorneus: e.g. cycles and missing packages" }, + "erroneous: e.g. cycles and missing packages" }, { 0x10001, "installed", "Consider only installed packages" }, }; diff --git a/src/fetch.c b/src/fetch.c index 1d7389c..cf2fde7 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -260,7 +260,7 @@ static int fetch_main(void *pctx, struct apk_database *db, struct apk_string_arr static struct apk_option fetch_options[] = { { 'L', "link", "Create hard links if possible" }, - { 'R', "recursive", "Fetch the PACKAGE and all it's dependencies" }, + { 'R', "recursive", "Fetch the PACKAGE and all its dependencies" }, { 's', "stdout", "Dump the .apk to stdout (incompatible with -o and -R)" }, { 'o', "output", "Directory to place the PACKAGEs to", diff --git a/src/index.c b/src/index.c index c61c78b..4a97911 100644 --- a/src/index.c +++ b/src/index.c @@ -245,7 +245,7 @@ static struct apk_option index_options[] = { { 'd', "description", "Embed TEXT as description and version " "information of the repository index", required_argument, "TEXT" }, - { 0x10000, "rewrite-arch", "Use ARCH as architery for all packages", + { 0x10000, "rewrite-arch", "Use ARCH as architecture for all packages", required_argument, "ARCH" }, }; @@ -419,8 +419,8 @@ static struct apk_option info_options[] = { { 'P', "provides", "List virtual packages provided by PACKAGE" }, { 'r', "rdepends", "List all packages depending on PACKAGE" }, { 0x10000, "replaces", "List packages whom files PACKAGE might replace" }, - { 'i', "install-if", "List the PACKAGE's install-if rule" }, - { 'I', "rinstall-if", "List all packages having install-if referencing PACKAGE" }, + { 'i', "install-if", "List the PACKAGE's install_if rule" }, + { 'I', "rinstall-if", "List all packages having install_if referencing PACKAGE" }, { 'w', "webpage", "Show URL for more information about PACKAGE" }, { 's', "size", "Show installed size of PACKAGE" }, { 'd', "description", "Print description for PACKAGE" }, diff --git a/src/lua-apk.c b/src/lua-apk.c index 28eee61..bae0ee7 100644 --- a/src/lua-apk.c +++ b/src/lua-apk.c @@ -75,7 +75,7 @@ static int Pversion_compare(lua_State *L) } /* version_is_less(verstr1, verstr2) - returns either '<', '=' or '>' + returns whether version is '<' */ static int Pversion_is_less(lua_State *L) { diff --git a/src/search.c b/src/search.c index 2b7b5e1..7ccf98a 100644 --- a/src/search.c +++ b/src/search.c @@ -1,4 +1,4 @@ -/* info.c - Alpine Package Keeper (APK) +/* search.c - Alpine Package Keeper (APK) * * Copyright (C) 2005-2009 Natanael Copa <n@tanael.org> * Copyright (C) 2008-2011 Timo Teräs <timo.teras@iki.fi> @@ -186,8 +186,8 @@ static struct apk_option ver_options[] = { { 't', "test", "Compare two given versions" }, { 'c', "check", "Check if the given version string is valid" }, { 'a', "all", "Consider packages from all repository tags" }, - { 'l', "limit", "Limit output to packages with status matching one of LIMCHARS", - required_argument, "LIMCHARS" }, + { 'l', "limit", "Limit output to packages with status matching one of LIMCHARs", + required_argument, "LIMCHARs" }, }; static struct apk_applet apk_ver = { |