Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-14 22:49:23 +01:00
Code Issues Projects Releases Wiki Activity

Unix: fix merge of @ping

Browse Source
This commit is contained in:
Valentin Lorentz 2011-02-26 09:50:15 +01:00
parent e35bf94600
commit 2d56eba17e
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/Unix/plugin.py
View File

@ -255,14 +255,10 @@ class Unix(callbacks.Plugin):
irc.error(_('The wtf command is not configured. If it is installed ' irc.error(_('The wtf command is not configured. If it is installed '
'on this system, reconfigure the ' 'on this system, reconfigure the '
'supybot.plugins.Unix.wtf.command configuration ' 'supybot.plugins.Unix.wtf.command configuration '
<<<<<<< HEAD
'variable appropriately.')) 'variable appropriately.'))
wtf = wrap(wtf, [optional(('literal', ['is'])), 'something'])
=======
'variable appropriately.')
wtf = thread(wrap(wtf, [optional(('literal', ['is'])), 'something'])) wtf = thread(wrap(wtf, [optional(('literal', ['is'])), 'something']))
>>>>>>> edc4d86... Unix: various enhancements to the ping command:
@internationalizeDocstring
def ping(self, irc, msg, args, optlist, host): def ping(self, irc, msg, args, optlist, host):
"""[--c <count>] [--i <interval>] [--t <ttl>] [--W <timeout>] <host or ip> """[--c <count>] [--i <interval>] [--t <ttl>] [--W <timeout>] <host or ip>
Sends an ICMP echo request to the specified host. Sends an ICMP echo request to the specified host.