Merge lp:~nick-moffitt/charms/precise/mysql/mysql-shopt-is-a-shell-builtin into lp:charms/mysql

Proposed by Nick Moffitt
Status: Merged
Merged at revision: 122
Proposed branch: lp:~nick-moffitt/charms/precise/mysql/mysql-shopt-is-a-shell-builtin
Merge into: lp:charms/mysql
Diff against target: 12 lines (+0/-2)
1 file modified
hooks/install (+0/-2)
To merge this branch: bzr merge lp:~nick-moffitt/charms/precise/mysql/mysql-shopt-is-a-shell-builtin
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Edward Hope-Morley Approve
James Page Approve
charmers Pending
Review via email: mp+217923@code.launchpad.net

Description of the change

It looks like someone converted a shell script hook over to Python rather literally, and included a call-out to a shell builtin. This causes the mysql charm in precise to fail pretty catastrophically in the install hook right now.

fixes bug #1315022

To post a comment you must log in.
Revision history for this message
Jacek Nykis (jacekn) wrote :

It failed for me as well, this change makes charm usable again

Revision history for this message
James Page (james-page) :
review: Approve
Revision history for this message
Edward Hope-Morley (hopem) wrote :

LGTM. Thanks!

Revision history for this message
Edward Hope-Morley (hopem) :
review: Approve
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2014-04-17 10:52:14 +0000
3+++ hooks/install 2014-05-01 14:39:24 +0000
4@@ -18,8 +18,6 @@
5
6 # Pre-exec
7 if os.path.isdir('exec.d'):
8- check_output(['shopt', '-s', 'nullglob'])
9-
10 for f in glob.glob("exec.d/*/charm-pre-install"):
11 if not os.access(f, os.X_OK):
12 continue

Subscribers

People subscribed via source and target branches