Merge lp:~zyga/checkbox/fix-1299486 into lp:checkbox

[Zygmunt Krynicki]

eabaf81 plainbox:provider_manager: fix install in flat layout

[Daniel Manrique (roadmr)]

thanks!

review: Approve

=== modified file 'plainbox/plainbox/provider_manager.py'
--- plainbox/plainbox/provider_manager.py	2014-03-28 13:22:04 +0000
+++ plainbox/plainbox/provider_manager.py	2014-03-29 15:49:18 +0000
@@ -153,7 +153,7 @@
     # Template of the location= entry
     _LOCATION_TEMPLATE = os.path.join(
         '{prefix}', 'lib', 'plainbox-providers-1',
-        '{provider.name_without_colon}')
+        '{provider.name}')
 
     # Templates for various installation layouts
     _INSTALL_LAYOUT = {

=== modified file 'plainbox/plainbox/test_provider_manager.py'
--- plainbox/plainbox/test_provider_manager.py	2014-03-28 13:22:04 +0000
+++ plainbox/plainbox/test_provider_manager.py	2014-03-29 15:49:18 +0000
@@ -88,7 +88,7 @@
             "[PlainBox Provider]\n"
             "description = description\n"
             "gettext_domain = domain\n"
-            "location = {prefix}/lib/plainbox-providers-1/2014.com.example.test\n"
+            "location = {prefix}/lib/plainbox-providers-1/2014.com.example:test\n"
             "name = 2014.com.example:test\n"
             "version = 1.0\n"
             "\n".format(prefix=prefix))