From 828b82ea9c515c4b67e55e5a917794c0b97eeb7c Mon Sep 17 00:00:00 2001
From: James Vega <jamessan@users.sourceforge.net>
Date: Sun, 29 Aug 2010 11:24:54 -0400
Subject: [PATCH] User: Handle DuplicateHostmask exception in hostmask.add.

Signed-off-by: James Vega <jamessan@users.sourceforge.net>
(cherry picked from commit 577294f48942efeda3b5ee09038dc0d1fa51deab)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
---
 plugins/User/plugin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/User/plugin.py b/plugins/User/plugin.py
index e08348239..e9eddc3b6 100644
--- a/plugins/User/plugin.py
+++ b/plugins/User/plugin.py
@@ -327,6 +327,8 @@ class User(callbacks.Plugin):
                 ircdb.users.setUser(user)
             except ValueError, e:
                 irc.error(str(e), Raise=True)
+            except ircdb.DuplicateHostmask:
+                irc.error('That hostmask is already registered.', Raise=True)
             irc.replySuccess()
         add = wrap(add, ['private', first('otherUser', 'user'),
                          optional('something'), additional('something', '')])