RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 30-Dec-2007 19:38:54
Branch: HEAD Handle: 2007123018385300
Modified files:
rpm CHANGES
rpm/lib rpmns.c
Log:
- jbj: fix: display RPMRC_NOKEY failures explicitly.
Summary:
Revision Changes Path
1.2042 +1 -0 rpm/CHANGES
1.11 +3 -1 rpm/lib/rpmns.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2041 -r1.2042 CHANGES
--- rpm/CHANGES 30 Dec 2007 16:47:41 -0000 1.2041
+++ rpm/CHANGES 30 Dec 2007 18:38:53 -0000 1.2042
@@ -1,4 +1,5 @@
5.0b3 -> 5.0b4:
+ - jbj: fix: display RPMRC_NOKEY failures explicitly.
- jbj: rip --predefine entirely, add comment re macro added both global/CLI.
- jbj: link tpgp against rpmnsProbeSignature() instead.
- jbj: add (hidden) --usecrypto option.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmns.c
============================================================================
$ cvs diff -u -r1.10 -r1.11 rpmns.c
--- rpm/lib/rpmns.c 30 Dec 2007 14:33:06 -0000 1.10
+++ rpm/lib/rpmns.c 30 Dec 2007 18:38:53 -0000 1.11
@@ -494,7 +494,9 @@
if (_rpmns_debug)
fprintf(stderr, "============================ verify: %s\n",
- (rc == RPMRC_OK ? "OK" : "FAIL"));
+ (rc == RPMRC_OK ? "OK" :
+ (rc == RPMRC_NOKEY ? "NOKEY" :
+ "FAIL")));
return rc;
}
@@ .
Received on Sun Dec 30 19:38:54 2007