Bugtracker: Fix bugSnarfer regex to (finally) detect "tracker: #number" format
PackageInfo: Force apt-file to i386 architecture, as update_apt_file only grabs that anyway
This commit is contained in:
parent
0e9d2e292b
commit
b038dca49c
|
@ -327,7 +327,7 @@ class Bugtracker(callbacks.PluginRegexp):
|
||||||
list = wrap(list, [additional('text')])
|
list = wrap(list, [additional('text')])
|
||||||
|
|
||||||
def bugSnarfer(self, irc, msg, match):
|
def bugSnarfer(self, irc, msg, match):
|
||||||
r"""\b(?P<bt>(([a-z0-9]+)?\s+bugs?|[a-z0-9]+):?)\s+#?(?P<bug>\d+(?!\d*[\-\.]\d+)((,|\s*(and|en|et|und|ir))\s*#?\d+(?!\d*[\-\.]\d+))*)"""
|
r"""\b(?P<bt>(([a-z0-9]+)?\s+bugs?|[a-z0-9]+)):?\s+#?(?P<bug>\d+(?!\d*[\-\.]\d+)((,|\s*(and|en|et|und|ir))\s*#?\d+(?!\d*[\-\.]\d+))*)"""
|
||||||
channel = ircutils.isChannel(msg.args[0]) and msg.args[0] or None
|
channel = ircutils.isChannel(msg.args[0]) and msg.args[0] or None
|
||||||
if not self.registryValue('bugSnarfer', channel):
|
if not self.registryValue('bugSnarfer', channel):
|
||||||
return
|
return
|
||||||
|
|
|
@ -52,7 +52,7 @@ class Apt:
|
||||||
-o"Dir::Cache=%s/cache"\\
|
-o"Dir::Cache=%s/cache"\\
|
||||||
-o"APT::Architecture=i386"\\
|
-o"APT::Architecture=i386"\\
|
||||||
%%s %%s""" % tuple([self.aptdir]*5)
|
%%s %%s""" % tuple([self.aptdir]*5)
|
||||||
self.aptfilecommand = """apt-file -s %s/%%s.list -c %s/apt-file/%%s -l search %%s""" % (self.aptdir, self.aptdir)
|
self.aptfilecommand = """apt-file -s %s/%%s.list -c %s/apt-file/%%s -l -a i386 search %%s""" % (self.aptdir, self.aptdir)
|
||||||
|
|
||||||
def find(self, pkg, chkdistro, filelookup=True):
|
def find(self, pkg, chkdistro, filelookup=True):
|
||||||
_pkg = ''.join([x for x in pkg.strip().split(None,1)[0] if x.isalnum() or x in '.-_+/'])
|
_pkg = ''.join([x for x in pkg.strip().split(None,1)[0] if x.isalnum() or x in '.-_+/'])
|
||||||
|
|
Loading…
Reference in New Issue