Libertine

Merge lp:~larryprice/libertine/lxc-home-path into lp:libertine

  1. lxc-home-path
  2. Merge into devel
Proposed by Larry Price
Status: Merged
Approved by: Christopher Townsend
Approved revision: 326
Merged at revision: 361
Proposed branch: lp:~larryprice/libertine/lxc-home-path
Merge into: lp:libertine
Diff against target: 18 lines (+2/-2)
1 file modified
tools/libertine-lxc-manager (+2/-2)
To merge this branch: bzr merge lp:~larryprice/libertine/lxc-home-path
Reviewer Review Type Date Requested Status
Libertine CI Bot continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+314183@code.launchpad.net

Commit message

libertine-lxc-manager needs to use proper home variable.

Description of the change

During a previous merge, forgot to update home_path global variable to be self._home on the class. Fixed!

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Ok, code looks good. Will test via the release silo:)

review: Approve
Revision history for this message
Libertine CI Bot (libertine-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/libertine-lxc-manager'
2--- tools/libertine-lxc-manager 2017-01-05 18:55:35 +0000
3+++ tools/libertine-lxc-manager 2017-01-05 19:58:38 +0000
4@@ -84,12 +84,12 @@
5 self._containers_config.get_container_bind_mounts(container_id))
6
7 data_dir = libertine.utils.get_libertine_container_userdata_dir_path(container_id)
8- for user_dir in libertine.utils.generate_binding_directories(mounts, home_path):
9+ for user_dir in libertine.utils.generate_binding_directories(mounts, self._home):
10 if os.path.isabs(user_dir[1]):
11 path = user_dir[1].strip('/')
12 fullpath = os.path.join(libertine.utils.get_libertine_container_rootfs_path(container_id), path)
13 else:
14- path = "{}/{}".format(home_path.strip('/'), user_dir[1])
15+ path = "{}/{}".format(self._home.strip('/'), user_dir[1])
16 fullpath = os.path.join(data_dir, user_dir[1])
17
18 os.makedirs(fullpath, exist_ok=True)

Subscribers

People subscribed via source and target branches