Skip to content

Commit

Permalink
prevent potential (but harmless) Python notice during builds)
Browse files Browse the repository at this point in the history
  • Loading branch information
dzuelke committed Aug 21, 2015
1 parent 7848d04 commit 1f671f8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# heroku-buildpack-php CHANGELOG

## v75 (2015-08-21)

### FIX

- Prevent potential (benign) Python notice during builds

## v74 (2015-08-21)

### FIX
Expand Down
2 changes: 1 addition & 1 deletion bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ print json.dumps(ret)
Run 'composer update' to have it re-generated by Composer."

# warn if minimum-stability is set to non-stable (regardless of whether prefer-stable is used)
if echo -n "$solver_payload" | python -c 'import sys, json; p = json.load(sys.stdin); sys.exit(p["lock"]["minimum-stability"] == "stable");'; then
if echo -n "$solver_payload" | python -c 'import sys, json; p = json.load(sys.stdin); sys.exit(p["lock"] == None or p["lock"]["minimum-stability"] == "stable");' 2> /dev/null; then
warning "Your 'composer.json' contains a non-'stable' setting
for 'minimum-stability'. This may cause the installation of
unstable versions of runtimes and extensions during this deploy.
Expand Down

0 comments on commit 1f671f8

Please sign in to comment.