[Pgp-tools-commit] r837 - trunk/caff

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-02-17 22:11:29 +0000 (Wed, 17 Feb 2016)
New Revision: 837

Modified:
   trunk/caff/caff
Log:
caff: move detection of deprecated options at the end of load_config.

(So the warning is printed using the right color.)

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2016-02-17 21:52:04 UTC (rev 836)
+++ trunk/caff/caff	2016-02-17 22:11:29 UTC (rev 837)
@@ -676,7 +676,6 @@
     @{$CONFIG{'keyid'}} = map { s/^0x//; uc (substr y/ //dr, -16) } @{$CONFIG{'keyid'}};
     $CONFIG{'export-sig-age'} //= 24*60*60;
     $CONFIG{'gpg'} //= $ENV{GNUPGBIN} // 'gpg';
-    mywarn("Deprecated option \$CONFIG{'$_'} = '$CONFIG{$_}'") for grep {defined $CONFIG{$_}} qw/gpg-sign gpg-delsig keyserver/;
 
     $CONFIG{'secret-keyring'} //= ($ENV{'GNUPGHOME'} // "$ENV{'HOME'}/.gnupg") . '/secring.gpg';
     $CONFIG{'no-download'} //= 0;
@@ -758,6 +757,10 @@
         }
         close $_ for ($fh, $fh2);
     }
+
+    # depreacted options, will be removed in a future release
+    mywarn("Deprecated option \$CONFIG{'$_'} = '$CONFIG{$_}'") foreach
+        grep {defined $CONFIG{$_}} qw{gpg-sign gpg-delsig keyserver};
 };
 
 # Create a new GnuPG::Interface object with common options