[interchange-cvs] interchange - heins modified code/UI_Tag/add_gpg_key.coretag

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2006-01-09 16:10:23 GMT
Modified:  code/UI_Tag add_gpg_key.coretag
Log:
* Fix bug with patch supplied by Gert.

* Also remove literal space from regex -- it should be a standard within
  interchange not to use *any* literal whitespace in regular expressions.
  A literal space could be embedded with \0x20 or such, but \s+ should always
  be preferred.

Revision  Changes    Path
1.5       +1 -1      interchange/code/UI_Tag/add_gpg_key.coretag


rev 1.5, prev_rev 1.4
Index: add_gpg_key.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/add_gpg_key.coretag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- add_gpg_key.coretag	8 Nov 2005 18:14:39 -0000	1.4
+++ add_gpg_key.coretag	9 Jan 2006 16:10:23 -0000	1.5
@@ -1,10 +1,10 @@
 # Copyright 2002-2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: add_gpg_key.coretag,v 1.4 2005/11/08 18:14:39 jon Exp $
+# $Id: add_gpg_key.coretag,v 1.5 2006/01/09 16:10:23 mheins Exp $
 
 UserTag add-gpg-key Order   name
 UserTag add-gpg-key addAttr
-UserTag add-gpg-key Version $Revision: 1.4 $
+UserTag add-gpg-key Version $Revision: 1.5 $
 UserTag add-gpg-key Routine <<EOR
 sub {
 	my ($name, $opt) = @_;
@@ -44,7 +44,7 @@
 			};
 		my $id;
 		while(<GETGPGID>) {
-			next unless /\bkey (\w+): public key imported/;
+			next unless /\bkey\s+(\w+)\s*:\s+(public\s+key|)(.*)(imported|not\s+changed)/i;
 			$id = $1;
 			last;
 		}