RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 03-Sep-2009 03:23:11
Branch: HEAD Handle: 2009090301231100
Modified files:
rpm/tools cp.c
Log:
- add option descriptions.
Summary:
Revision Changes Path
2.8 +18 -15 rpm/tools/cp.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/cp.c
============================================================================
$ cvs diff -u -r2.7 -r2.8 cp.c
--- rpm/tools/cp.c 3 Sep 2009 00:42:48 -0000 2.7
+++ rpm/tools/cp.c 3 Sep 2009 01:23:11 -0000 2.8
@@ -899,29 +899,32 @@
/*...@=type@*/
{ NULL,'H', POPT_ARG_NONE, NULL, (int)'H',
- NULL, NULL },
- { NULL,'L', POPT_ARG_NONE, NULL, (int)'L',
- NULL, NULL },
- { NULL,'P', POPT_ARG_NONE, NULL, (int)'P',
- NULL, NULL },
- { NULL,'R', POPT_ARG_NONE, NULL, (int)'R',
- NULL, NULL },
+ N_("Follow command-line symbolic links"), NULL },
+ { "dereference",'L', POPT_ARG_NONE, NULL, (int)'L',
+ N_("Always follow symbolic links"), NULL },
+ { "nodereference",'P', POPT_ARG_NONE, NULL, (int)'P',
+ N_("Never follow symbolic links"), NULL },
+ { "recursive",'R', POPT_ARG_NONE, NULL, (int)'R',
+ N_("Copy directories recursively"), NULL },
{ "archive",'a', POPT_ARG_NONE, NULL, (int)'a',
- NULL, NULL },
+ N_("Archive mode (same as -RpP)"), NULL },
{ "force",'f', POPT_ARG_NONE, NULL, (int)'f',
- NULL, NULL },
+ N_("Unlink and retry if 1st open fails"), NULL },
{ "interactive",'i', POPT_ARG_NONE, NULL, (int)'i',
- NULL, NULL },
+ N_("Prompt before overwriting a file"), NULL },
{ "link",'l', POPT_ARG_NONE, NULL, (int)'l',
- NULL, NULL },
+ N_("Link files instead of copying"), NULL },
{ "noclobber",'n', POPT_ARG_NONE, NULL, (int)'n',
- NULL, NULL },
+ N_("Do not overwrite an existing file"), NULL },
{ "preserve",'p', POPT_ARG_NONE, NULL, (int)'p',
- NULL, NULL },
+ N_("Preserve mode/ownership/timestamps"), NULL },
+#ifdef DYING
+ /* XXX conflicts with -r, --root */
{ NULL,'r', POPT_ARG_NONE, NULL, (int)'r',
- NULL, NULL },
+ N_("Copy directories recursively"), NULL },
+#endif
{ "verbose",'v', POPT_ARG_NONE, NULL, (int)'v',
- NULL, NULL },
+ N_("Explain what is being done"), NULL },
#ifdef NOTYET
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioFtsPoptTable, 0,
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
