Correct path of ~/.caffrc in informational messages (Closes: #582603).

~/.caffrc. (Closes: #540165).

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@459 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/caff/caff b/caff/caff
index 9378562164c4c916d1a46e72119ce6372d183a1c..0f659f330b6e7529d365b52c3be810aeebf39784 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -907,8 +907,8 @@ sub delete_signatures($$$$$$) {
 # Check the local user keys.
 #
 # This function checks if the keyids defined through the --local-user
-# command line option or set in .caffrc are valid and known to be one of the
-# keyids listed in ./caffrc. The last check ensure we have those keyids
+# command line option or set in ~/.caffrc are valid and known to be one of the
+# keyids listed in ~/.caffrc. The last check ensure we have those keyids
 # available in the caff's gnupghome directory.
 #
 # @return an array containing the local user keys\n
@@ -945,7 +945,7 @@ sub get_local_user_keys()
                }
                
                unless (grep (/$user_key$/, @{$CONFIG{'keyid'}})) {
-                       mywarn "Local-user $user_key is not defined as one of your keyid in ./caffrc (it will not be used).";
+                       mywarn "Local-user $user_key is not defined as one of your keyid in ~/.caffrc (it will not be used).";
                        next;
                }
                
@@ -954,7 +954,7 @@ sub get_local_user_keys()
 
        # If no local-user key are valid, there is no need to go further
        unless (defined $local_user[0]) {
-               myerror (1, "None of the local-user keys seem to be known as a keyid listed in ./caffrc.");
+               myerror (1, "None of the local-user keys seem to be known as a keyid listed in ~/.caffrc.");
        }
 
        return @local_user;

diff --git a/debian/changelog b/debian/changelog
index 96abb986cb7404585b7dee95685912cb732b3688..04178c19b312a8c1d1c19015049f1f0dd3478cd3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+signing-party (1.1.3-2) UNRELEASED; urgency=low
+
+  * Correct path of ~/.caffrc in informational messages (Closes: #582603).
+
+ -- Thijs Kinkhorst <thijs@debian.org>  Sun, 23 May 2010 14:08:28 +0200
+
 signing-party (1.1.3-1) unstable; urgency=low
 
   [ Franck Joncourt ]
@@ -31,7 +37,7 @@ signing-party (1.1.2-1) unstable; urgency=low
   * caff: Updated check for the local-user keyids.
     + Moved the current check to a new function get_local_user_keys().
     + Warned the user if a local-user keyid is not listed as a keyid in
-      ./caffrc. (Closes: #540165).
+      ~/.caffrc. (Closes: #540165).
   * gpgdir: New upstream release.
   * gpg-mailkeys:
     + The charset for the text of the message is deduced from the charset used