Merge lp:~pconnell/endroid/remote into lp:endroid

[Phil Connell]

Fix "endroid_remote watch" and tag 1.4.5 release.

Fix endroid_remote watch and tag 1.4.5 release.

Failure seen with 1.4.4:

$ cat /proc/cpuinfo | endroid_remote watch "model name"
processor : 0
Traceback (most recent call last):
  File "/auto/ensoft/bin/endroid_remote", line 175, in <module>
    sys.exit(main(sys.argv[1:]))
  File "/auto/ensoft/bin/endroid_remote", line 167, in main
    subcmd_obj.event_loop()
  File "/auto/ensoft/bin/endroid_remote", line 83, in event_loop
    if self._re.search(line):
AttributeError: 'str' object has no attribute 'search'

[ChrisD (gingerchris)]

Thanks!

review: Approve

[lp:~pconnell/endroid/remote]

97. By Phil Connell <email address hidden> on 2014-10-10

Fix "endroid_remote watch" and tag 1.4.5 release.

=== modified file 'bin/endroid_remote'
--- bin/endroid_remote	2014-09-15 11:23:47 +0000
+++ bin/endroid_remote	2014-10-10 11:21:02 +0000
@@ -72,7 +72,7 @@
                             "lines will be sent to EnDroid")
 
     def process_args(self, args):
-        self._re = args.regex
+        self._re = re.compile(args.regex)
 
     def event_loop(self):
         line = sys.stdin.readline()

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-03 10:17:08 +0000
+++ debian/changelog	2014-10-10 11:21:02 +0000
@@ -1,3 +1,9 @@
+endroid (1.4.5) trusty; urgency=medium
+
+  * Fix endroid_remote watch.
+
+ -- Phil Connell <[e-mail]>  Fri, 10 Oct 2014 12:18:00 +0100
+
 endroid (1.4.4) trusty; urgency=medium
 
   * Fix MUC behaviour for servers that do not allow nickname changes

=== modified file 'setup.py'
--- setup.py	2014-10-03 11:00:53 +0000
+++ setup.py	2014-10-10 11:21:02 +0000
@@ -24,7 +24,7 @@
 
 
 setup(name='endroid',
-      version="1.4.4",
+      version="1.4.5",
       description='EnDroid: a modular XMPP bot',
       url='http://open.ensoft.co.uk/EnDroid',
       packages=[