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

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Daniel Manrique
Approved revision: 2909
Merged at revision: 2910
Proposed branch: lp:~zyga/checkbox/fix-1306051
Merge into: lp:checkbox
Diff against target: 21 lines (+4/-1)
1 file modified
plainbox/plainbox/provider_manager.py (+4/-1)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1306051
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+215245@code.launchpad.net

Description of the change

8afe5b7 plainbox:provider_manager: don't create bin/ blindly

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

+1, easy enough. No tests:

12:32 < zyga> roadmr: there are no tests as provider_manager has no unit tests and clearly
              has not enough intergration tests to make that change matter
12:32 < zyga> roadmr: I thought about adding more but I need to refactor some code first,
              to make creating testbeds like that easier

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plainbox/plainbox/provider_manager.py'
--- plainbox/plainbox/provider_manager.py 2014-04-04 16:16:31 +0000
+++ plainbox/plainbox/provider_manager.py 2014-04-10 16:31:52 +0000
@@ -267,13 +267,16 @@
267 layout, prefix, provider).write(stream))267 layout, prefix, provider).write(stream))
268268
269 def _copy_all_executables(self, root, prefix, layout, provider):269 def _copy_all_executables(self, root, prefix, layout, provider):
270 executable_list = provider.get_all_executables()
271 if not executable_list:
272 return
270 dest_map = self._get_dest_map(layout, prefix)273 dest_map = self._get_dest_map(layout, prefix)
271 dest_bin_dir = root + dest_map['bin']274 dest_bin_dir = root + dest_map['bin']
272 try:275 try:
273 os.makedirs(dest_bin_dir, exist_ok=True)276 os.makedirs(dest_bin_dir, exist_ok=True)
274 except IOError:277 except IOError:
275 pass278 pass
276 for executable in provider.get_all_executables():279 for executable in executable_list:
277 shutil.copy(executable, dest_bin_dir)280 shutil.copy(executable, dest_bin_dir)
278281
279 def _copy_all_data(self, root, prefix, layout):282 def _copy_all_data(self, root, prefix, layout):

Subscribers

People subscribed via source and target branches