Review Request 119791: Fix Regexp to match new upstart version output

Philip Muskovac yofel at gmx.net
Thu Aug 14 18:14:46 UTC 2014


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119791/
-----------------------------------------------------------

Review request for Plasma.


Repository: powerdevil


Description
-------

So upstart likes to give people headaches and changed how it prints the version over dbus:

$ qdbus com.ubuntu.Upstart /com/ubuntu/Upstart com.ubuntu.Upstart0_6.version
init (upstart 1.12.1)

vs.

$ qdbus com.ubuntu.Upstart /com/ubuntu/Upstart com.ubuntu.Upstart0_6.version 
upstart 1.13.1

so now the regexp in the powerdevil version check doesn't match anymore. Fixed by making init and brackets optional


Diffs
-----

  daemon/backends/upower/powerdevilupowerbackend.cpp 6b7c650 

Diff: https://git.reviewboard.kde.org/r/119791/diff/


Testing
-------

"(?:init \()?upstart ([0-9.]+)(?:\))?" matches both "upstart 1.13.1" and "init (upstart 1.12.1)"


Thanks,

Philip Muskovac

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20140814/2077eb1f/attachment.html>


More information about the Plasma-devel mailing list