From 2aa129bc7075254e24b5ced06a2bb11c137c0ba6 Mon Sep 17 00:00:00 2001
From: Andrew Page <andrew@infosiftr.com>
Date: Mon, 29 Oct 2012 17:15:52 -0600
Subject: [PATCH] fix for keysubdirs-as-groups sugar script to support "old
 style multi-keys" for users

---
 src/syntactic-sugar/keysubdirs-as-groups | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/syntactic-sugar/keysubdirs-as-groups b/src/syntactic-sugar/keysubdirs-as-groups
index 69a69b1..0a3a9ae 100644
--- a/src/syntactic-sugar/keysubdirs-as-groups
+++ b/src/syntactic-sugar/keysubdirs-as-groups
@@ -20,7 +20,7 @@ sub groupnames {
     my @out     = ();
     my %members = ();
     for my $pk (`find ../keydir/ -name "*.pub"`) {
-        next unless $pk =~ m(.*/([^/]+)/([^/]+)\.pub$);
+        next unless $pk =~ m(.*/([^/]+)/([^/]+?)(?:@[^./]+)?\.pub$);
         next if $1 eq 'keydir';
         $members{$1} .= " $2";
     }