summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJindrich Novy <jnovy@redhat.com>2009-03-02 10:29:05 +0100
committerPanu Matilainen <pmatilai@redhat.com>2009-04-03 13:59:27 +0300
commite84e0adc0ae5d9f99f39fad809c873249e3dc9fc (patch)
tree0f1aa34f82f98e5cde0982821895d30b570623bb
parent4ada6601ce6538d9e9cf3f56057b0fd8af8fffef (diff)
downloadrpm-e84e0adc0ae5d9f99f39fad809c873249e3dc9fc.tar.gz
rpm-e84e0adc0ae5d9f99f39fad809c873249e3dc9fc.tar.bz2
rpm-e84e0adc0ae5d9f99f39fad809c873249e3dc9fc.zip
Fix documentation and help for the md5 -> filedigest move
- add aliases for obsolete {RPM}VERIFY_MD5 flags to not to break API (cherry picked from commit c45cfb9c047b05ca29acb8d42186e97e17204e27)
-rw-r--r--doc/manual/spec2
-rw-r--r--doc/rpm.82
-rw-r--r--lib/poptI.c4
-rw-r--r--lib/poptQV.c4
-rw-r--r--lib/rpmvf.h6
5 files changed, 10 insertions, 8 deletions
diff --git a/doc/manual/spec b/doc/manual/spec
index 762f57067..82ddcf390 100644
--- a/doc/manual/spec
+++ b/doc/manual/spec
@@ -105,7 +105,7 @@ The virtual file attribute token %verify tells `-V/--verify' to ignore
certain features on files which may be modified by (say) a postinstall
script so that false problems are not displayed during package verification.
\verbatim
- %verify(not size md5 mtime) %{prefix}/bin/javaswarm
+ %verify(not size filedigest mtime) %{prefix}/bin/javaswarm
\endverbatim
\section specfile_globbing Shell Globbing of %files Section
diff --git a/doc/rpm.8 b/doc/rpm.8
index d6d497322..f17874f07 100644
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -594,7 +594,7 @@ Dump file information as follows (implies \fB-l\fR):
.RS
.nf
-path size mtime md5sum mode owner group isconfig isdoc rdev symlink
+path size mtime filedigest mode owner group isconfig isdoc rdev symlink
.fi
.RE
diff --git a/lib/poptI.c b/lib/poptI.c
index 77dd14e4f..f460f96b1 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -199,10 +199,10 @@ struct poptOption rpmInstallPoptTable[] = {
&rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS,
N_("do not install documentation"), NULL},
- { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOFILEDIGEST,
- N_("don't verify digest of files"), NULL },
{ "nofiledigest", '\0', 0, NULL, RPMCLI_POPT_NOFILEDIGEST,
N_("don't verify digest of files"), NULL },
+ { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOFILEDIGEST,
+ N_("don't verify digest of files (obsolete)"), NULL },
{ "nocontexts", '\0',0, NULL, RPMCLI_POPT_NOCONTEXTS,
N_("don't install file security contexts"), NULL},
diff --git a/lib/poptQV.c b/lib/poptQV.c
index b54c915f4..b0f8322fa 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -272,10 +272,10 @@ struct poptOption rpmVerifyPoptTable[] = {
/* Duplicate file verify flags from packages into command line options. */
/** @todo Add --nomd5 alias to rpmpopt, eliminate. */
- { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_FILEDIGEST,
- N_("don't verify digest of files"), NULL },
{ "nofiledigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_FILEDIGEST,
N_("don't verify digest of files"), NULL },
+ { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_FILEDIGEST,
+ N_("don't verify digest of files (obsolete)"), NULL },
{ "nosize", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&rpmQVKArgs.qva_flags, VERIFY_SIZE,
N_("don't verify size of files"), NULL },
diff --git a/lib/rpmvf.h b/lib/rpmvf.h
index 023c1be53..57879557e 100644
--- a/lib/rpmvf.h
+++ b/lib/rpmvf.h
@@ -16,7 +16,8 @@ extern "C" {
*/
typedef enum rpmVerifyAttrs_e {
RPMVERIFY_NONE = 0, /*!< */
- RPMVERIFY_FILEDIGEST= (1 << 0), /*!< from %verify(md5) or %verify(filedigest) */
+ RPMVERIFY_MD5 = (1 << 0), /*!< from %verify(md5) - obsolete */
+ RPMVERIFY_FILEDIGEST= (1 << 0), /*!< from %verify(filedigest) */
RPMVERIFY_FILESIZE = (1 << 1), /*!< from %verify(size) */
RPMVERIFY_LINKTO = (1 << 2), /*!< from %verify(link) */
RPMVERIFY_USER = (1 << 3), /*!< from %verify(user) */
@@ -43,7 +44,8 @@ typedef enum rpmVerifyAttrs_e {
*/
typedef enum rpmVerifyFlags_e {
VERIFY_DEFAULT = 0, /*!< */
- VERIFY_FILEDIGEST = (1 << 0), /*!< from --nomd5 or --nofiledigest */
+ VERIFY_MD5 = (1 << 0), /*!< from --nomd5 - obsolete */
+ VERIFY_FILEDIGEST = (1 << 0), /*!< from --nofiledigest */
VERIFY_SIZE = (1 << 1), /*!< from --nosize */
VERIFY_LINKTO = (1 << 2), /*!< from --nolinkto */
VERIFY_USER = (1 << 3), /*!< from --nouser */