Charm Helpers

Merge lp:~freyes/charm-helpers/makefile into lp:charm-helpers

  1. makefile
  2. Merge into devel
Proposed by Felipe Reyes
Status: Merged
Merged at revision: 754
Proposed branch: lp:~freyes/charm-helpers/makefile
Merge into: lp:charm-helpers
Diff against target: 20 lines (+2/-2)
1 file modified
Makefile (+2/-2)
To merge this branch: bzr merge lp:~freyes/charm-helpers/makefile
Reviewer Review Type Date Requested Status
Jorge Niedbalski (community) Approve
Alex Kavanagh Approve
Review via email: mp+325780@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Kavanagh (ajkavanagh) wrote :

Nice :)

review: Approve
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2017-04-07 13:45:09 +0000
3+++ Makefile 2017-06-15 22:17:38 +0000
4@@ -38,14 +38,14 @@
5 python setup.py install --user
6
7 .venv:
8- sudo apt-get install -y gcc python-dev python-virtualenv python-apt
9+ dpkg -l gcc python-dev python-virtualenv python-apt > /dev/null || sudo apt-get install -y gcc python-dev python-virtualenv python-apt
10 virtualenv .venv --system-site-packages
11 .venv/bin/pip install -U pip
12 .venv/bin/pip install -I -r test_requirements.txt
13 .venv/bin/pip install bzr
14
15 .venv3:
16- sudo apt-get install -y gcc python3-dev python-virtualenv python3-apt
17+ dpkg -l gcc python3-dev python-virtualenv python3-apt > /dev/null || sudo apt-get install -y gcc python3-dev python-virtualenv python3-apt
18 virtualenv .venv3 --python=python3 --system-site-packages
19 .venv3/bin/pip install -U pip
20 .venv3/bin/pip install -I -r test_requirements.txt

Subscribers

People subscribed via source and target branches