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

Proposed by Phil Connell
Status: Merged
Approved by: ChrisD
Approved revision: no longer in the source branch.
Merged at revision: 97
Proposed branch: lp:~pconnell/endroid/remote
Merge into: lp:endroid
Diff against target: 39 lines (+8/-2)
3 files modified
bin/endroid_remote (+1/-1)
debian/changelog (+6/-0)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~pconnell/endroid/remote
Reviewer Review Type Date Requested Status
ChrisD Approve
Review via email: mp+237943@code.launchpad.net

Commit message

Fix "endroid_remote watch" and tag 1.4.5 release.

Description of the change

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'

To post a comment you must log in.
Revision history for this message
ChrisD (gingerchris) wrote :

Thanks!

review: Approve
lp:~pconnell/endroid/remote updated
97. By Phil Connell <email address hidden>

Fix "endroid_remote watch" and tag 1.4.5 release.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
72 "lines will be sent to EnDroid")72 "lines will be sent to EnDroid")
7373
74 def process_args(self, args):74 def process_args(self, args):
75 self._re = args.regex75 self._re = re.compile(args.regex)
7676
77 def event_loop(self):77 def event_loop(self):
78 line = sys.stdin.readline()78 line = sys.stdin.readline()
7979
=== 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 @@
1endroid (1.4.5) trusty; urgency=medium
2
3 * Fix endroid_remote watch.
4
5 -- Phil Connell <phil.connell@ensoft.co.uk> Fri, 10 Oct 2014 12:18:00 +0100
6
1endroid (1.4.4) trusty; urgency=medium7endroid (1.4.4) trusty; urgency=medium
28
3 * Fix MUC behaviour for servers that do not allow nickname changes9 * Fix MUC behaviour for servers that do not allow nickname changes
410
=== 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 @@
2424
2525
26setup(name='endroid',26setup(name='endroid',
27 version="1.4.4",27 version="1.4.5",
28 description='EnDroid: a modular XMPP bot',28 description='EnDroid: a modular XMPP bot',
29 url='http://open.ensoft.co.uk/EnDroid',29 url='http://open.ensoft.co.uk/EnDroid',
30 packages=[30 packages=[

Subscribers

People subscribed via source and target branches