catdog2/urlbot-native-trex
1
0
Fork 0
mirror of http://aero2k.de/t/repos/urlbot-native.git synced 2017-09-06 15:25:38 +02:00
Code Issues Releases Activity

fix info and dsa

Browse Source
This commit is contained in:
Thorsten
2015-11-28 14:44:12 +01:00
parent 5cdd0dd3b3
commit c4e6818fcb
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins.py
View File

@@ -441,10 +441,10 @@ def command_info(argv, **args):
return { return {
'msg': args['reply_user'] + ( 'msg': args['reply_user'] + (
''': I'm a bot, my job is to extract <title> tags from posted URLs. In case I'm annoying or for further ''': I'm a bot, my job is to extract <title> tags from posted URLs. In case I'm annoying or for further
questions, please talk to my master %s. I'm rate limited and shouldn't post more questions, please talk to my master %s. I'm rate limited.
than %d messages per %d seconds. To make me exit immediately, highlight me with 'hangup' in the message To make me exit immediately, highlight me with 'hangup' in the message
(emergency only, please). For other commands, highlight me with 'help'.''' % ( (emergency only, please). For other commands, highlight me with 'help'.''' % (
conf('bot_owner'), int(conf('hist_max_count')), int(conf('hist_max_time')))) conf('bot_owner')))
} }
@@ -734,7 +734,7 @@ def command_wp(argv, lang='de', **args):
@pluginfunction('excuse', 'prints BOFH style excuses', ptypes_COMMAND) @pluginfunction('excuse', 'prints BOFH style excuses', ptypes_COMMAND)
def command_dummy(argv, **args): def command_excuse(argv, **args):
if 'excuse' != argv[0]: if 'excuse' != argv[0]:
return return
@@ -910,9 +910,6 @@ def command_dsa_watcher(argv, **_):
if result: if result:
package = result.groups()[0] package = result.groups()[0]
out.append(
'new Debian Security Announce found (%s): %s' % (str(package).replace(' - security update', ''), url))
if conf('persistent_locked'): if conf('persistent_locked'):
msg = "couldn't get exclusive lock" msg = "couldn't get exclusive lock"
log.warn(msg) log.warn(msg)
@@ -932,7 +929,7 @@ def command_dsa_watcher(argv, **_):
conf_save(blob) conf_save(blob)
set_conf('persistent_locked', False) set_conf('persistent_locked', False)
msg = 'new Debian Security Announce found (%s): %s' % (package, url) msg = ('new Debian Security Announce found (%s): %s' % (str(package).replace(' - security update', ''), url))
out.append(msg) out.append(msg)
log.info('no dsa for %d, trying again...' % dsa) log.info('no dsa for %d, trying again...' % dsa)