FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 03-25-2011, 05:49 PM
Dan McGee
 
Default Update usage instruction strings

* Address FS#23433 by documenting -d vs. -dd
* Drop the useless "as well", "also", "too", and "that won't break
packages" strings from -R usage
* Fix alignment of multiline strings in source (no string change)

Signed-off-by: Dan McGee <dan@archlinux.org>
---
src/pacman/pacman.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 2847fd5..0ad0354 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -114,6 +114,7 @@ static void usage(int op, const char * const myname)
char const * const str_usg = _("usage");
char const * const str_opr = _("operation");

+ /* please limit your strings to 80 characters in width */
if(op == PM_OP_MAIN) {
printf("%s: %s <%s> [...]
", str_usg, myname, str_opr);
printf(_("operations:
"));
@@ -132,10 +133,10 @@ static void usage(int op, const char * const myname)
printf("%s: %s {-R --remove} [%s] <%s>
", str_usg, myname, str_opt, str_pkg);
printf("%s:
", str_opt);
addlist(_(" -c, --cascade remove packages and all packages that depend on them
"));
- addlist(_(" -n, --nosave remove configuration files as well
"));
- addlist(_(" -s, --recursive remove dependencies also (that won't break packages)
"
- " (-ss includes explicitly installed dependencies too)
"));
- addlist(_(" -u, --unneeded remove unneeded packages (that won't break packages)
"));
+ addlist(_(" -n, --nosave remove configuration files
"));
+ addlist(_(" -s, --recursive remove unnecessary dependencies
"
+ " (-ss includes explicitly installed dependencies)
"));
+ addlist(_(" -u, --unneeded remove unneeded packages
"));
} else if(op == PM_OP_UPGRADE) {
printf("%s: %s {-U --upgrade} [%s] <%s>
", str_usg, myname, str_opt, str_file);
printf("%s:
", str_opt);
@@ -186,16 +187,16 @@ static void usage(int op, const char * const myname)
addlist(_(" --asexplicit install packages as explicitly installed
"));
addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)
"));
addlist(_(" --ignoregroup <grp>
"
- " ignore a group upgrade (can be used more than once)
"));
+ " ignore a group upgrade (can be used more than once)
"));
/* pass through */
case PM_OP_REMOVE:
- addlist(_(" -d, --nodeps skip dependency checks
"));
+ addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)
"));
addlist(_(" -k, --dbonly only modify database entries, not package files
"));
addlist(_(" --noprogressbar do not show a progress bar when downloading files
"));
addlist(_(" --noscriptlet do not execute the install scriptlet if one exists
"));
- addlist(_(" --print only print the targets instead of performing the operation
"));
+ addlist(_(" --print print the targets instead of performing the operation
"));
addlist(_(" --print-format <string>
"
- " specify how the targets should be printed
"));
+ " specify how the targets should be printed
"));
break;
}

--
1.7.4.1
 

Thread Tools




All times are GMT. The time now is 05:26 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org