From cedd6a2b594477273ee6b23f623489e0a841edc1 Mon Sep 17 00:00:00 2001
From: James Vega <jamessan@users.sourceforge.net>
Date: Wed, 15 Dec 2004 17:54:33 +0000
Subject: [PATCH] Add some Raise=True and a test for multiple replies from
 Misc.hostmask.

---
 src/User.py       | 3 ++-
 src/commands.py   | 2 +-
 test/test_Misc.py | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/User.py b/src/User.py
index 7027b1600..b765fef9d 100755
--- a/src/User.py
+++ b/src/User.py
@@ -316,7 +316,8 @@ class User(callbacks.Privmsg):
             user = ircdb.users.getUser(msg.prefix)
             if name:
                 if name != user.name and not user.checkCapability('owner'):
-                    irc.error('You may only retrieve your own hostmasks.')
+                    irc.error('You may only retrieve your own hostmasks.',
+                              Raise=True)
                 else:
                     try:
                         user = ircdb.users.getUser(name)
diff --git a/src/commands.py b/src/commands.py
index b0cd8363f..4c15d1114 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -344,7 +344,7 @@ def getSeenNick(irc, msg, args, state, errmsg=None):
     except KeyError:
         if errmsg is None:
             errmsg = 'I haven\'t seen %s.' % args[0]
-        irc.error(errmsg)
+        irc.error(errmsg, Raise=True)
 
 def getChannel(irc, msg, args, state):
     if args and irc.isChannel(args[0]):
diff --git a/test/test_Misc.py b/test/test_Misc.py
index 18e1cd978..104ce6939 100644
--- a/test/test_Misc.py
+++ b/test/test_Misc.py
@@ -244,6 +244,9 @@ class MiscTestCase(ChannelPluginTestCase):
 
     def testHostmask(self):
         self.assertResponse('hostmask', self.prefix)
+        self.assertError('@hostmask asdf')
+        m = self.irc.takeMsg()
+        self.failIf(m is not None, m)
 
     def testApropos(self):
         self.assertNotError('apropos f')