From b038dca49c23f556aa154b292ca7af10161d7c3a Mon Sep 17 00:00:00 2001 From: tsimpson Date: Thu, 27 Sep 2012 13:16:42 +0100 Subject: [PATCH] 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 --- Bugtracker/plugin.py | 2 +- PackageInfo/packages.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bugtracker/plugin.py b/Bugtracker/plugin.py index 5d9bd5a..4899242 100644 --- a/Bugtracker/plugin.py +++ b/Bugtracker/plugin.py @@ -327,7 +327,7 @@ class Bugtracker(callbacks.PluginRegexp): list = wrap(list, [additional('text')]) def bugSnarfer(self, irc, msg, match): - r"""\b(?P(([a-z0-9]+)?\s+bugs?|[a-z0-9]+):?)\s+#?(?P\d+(?!\d*[\-\.]\d+)((,|\s*(and|en|et|und|ir))\s*#?\d+(?!\d*[\-\.]\d+))*)""" + r"""\b(?P(([a-z0-9]+)?\s+bugs?|[a-z0-9]+)):?\s+#?(?P\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 if not self.registryValue('bugSnarfer', channel): return diff --git a/PackageInfo/packages.py b/PackageInfo/packages.py index 25ca09f..42f3b0f 100644 --- a/PackageInfo/packages.py +++ b/PackageInfo/packages.py @@ -52,7 +52,7 @@ class Apt: -o"Dir::Cache=%s/cache"\\ -o"APT::Architecture=i386"\\ %%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): _pkg = ''.join([x for x in pkg.strip().split(None,1)[0] if x.isalnum() or x in '.-_+/'])