Merge lp:~fo0bar/turku-charms/turku-storage-charm into lp:turku-charms/turku-storage-charm

Proposed by Ryan Finnie on 2019-05-22
Status: Merged
Merged at revision: 7
Proposed branch: lp:~fo0bar/turku-charms/turku-storage-charm
Merge into: lp:turku-charms/turku-storage-charm
Diff against target: 17 lines (+2/-2)
1 file modified
hooks/hooks.py (+2/-2)
To merge this branch: bzr merge lp:~fo0bar/turku-charms/turku-storage-charm
Reviewer Review Type Date Requested Status
Stuart Bishop 2019-05-22 Pending
Review via email: mp+367791@code.launchpad.net

Commit message

Convert payload turku-storage to Python 3

Description of the change

(yes, this charm is ancient and needs to be converted to reactive)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2018-05-02 20:53:29 +0000
3+++ hooks/hooks.py 2019-05-22 17:26:11 +0000
4@@ -51,11 +51,11 @@
5
6 subprocess.check_call(['apt-get', 'update'])
7 subprocess.check_call(
8- ['apt-get', '-y', 'install', 'python', 'python2.7', 'python-pkg-resources', 'rsync', 'lvm2']
9+ ['apt-get', '-y', 'install', 'python3', 'python3-pkg-resources', 'rsync', 'lvm2']
10 )
11
12 cwd = os.environ['CHARM_DIR']
13- subprocess.check_call(['python', 'setup.py', 'install'], cwd='%s/files/turku-storage' % cwd)
14+ subprocess.check_call(['python3', 'setup.py', 'install'], cwd='%s/files/turku-storage' % cwd)
15
16 try:
17 pwd.getpwnam(PING_USER)

Subscribers

People subscribed via source and target branches

to all changes: