Merge lp://qastaging/~lomov-as/charm-helpers/cloud-foundry into lp://qastaging/~cf-charmers/charm-helpers/cloud-foundry
Proposed by
Alex Lomov
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~lomov-as/charm-helpers/cloud-foundry |
Merge into: | lp://qastaging/~cf-charmers/charm-helpers/cloud-foundry |
Diff against target: |
59 lines (+8/-8) 4 files modified
README.txt (+1/-1) charmhelpers/contrib/cloudfoundry/common.py (+3/-3) charmhelpers/contrib/cloudfoundry/upstart_helper.py (+3/-3) test_requirements.txt (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~lomov-as/charm-helpers/cloud-foundry |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Benjamin Saller | Pending | ||
Review via email: mp+215018@code.qastaging.launchpad.net |
Description of the change
update helpers
To post a comment you must log in.
Reviewers: mp+215018_ code.launchpad. net,
Message:
Please take a look.
Description:
update helpers
https:/ /code.launchpad .net/~lomov- as/charm- helpers/ cloud-foundry/ +merge/ 215018
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/88870043/
Affected files (+10, -8 lines): contrib/ cloudfoundry/ common. py contrib/ cloudfoundry/ upstart_ helper. py ts.txt
M README.txt
A [revision details]
M charmhelpers/
M charmhelpers/
M test_requiremen
Index: README.txt
=== modified file 'README.txt'
--- README.txt 2014-04-03 18:05:09 +0000
+++ README.txt 2014-04-09 19:14:19 +0000
@@ -11,6 +11,6 @@
How to run tests
---
-sudo apt-get install python-dev python-apt python-virtualenv
libapt-pkg-dev zip
+sudo apt-get install python-dev python-apt python-virtualenv
libapt-pkg-dev zip debhelper
make test
Index: [revision details] cf-juju- 20140416145110- u7k780vtt4i01bz 0
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: vagrant@
Index: test_requiremen ts.txt nts.txt' ts.txt 2014-04-03 18:05:09 +0000 ts.txt 2014-04-09 19:14:19 +0000 =1.10.2
=== modified file 'test_requireme
--- test_requiremen
+++ test_requiremen
@@ -13,4 +13,4 @@
testtools==0.9.35
wsgiref==0.1.2
launchpadlib=
-bzr==2.6.0
+
Index: charmhelpers/ contrib/ cloudfoundry/ common. py contrib/ cloudfoundry/ common. py' contrib/ cloudfoundry/ common. py 2014-04-01 06:50:54 +0000 contrib/ cloudfoundry/ common. py 2014-04-11 01:06:32 +0000 group). gr_gid os.path. join(root, momo), uid, gid) os.path. join(root, momo), uid, gid) os.path. join(root, momo), uid, gid) os.path. join(root, momo), uid, gid)
=== modified file 'charmhelpers/
--- charmhelpers/
+++ charmhelpers/
@@ -48,9 +48,9 @@
gid = grp.getgrnam(
for root, dirs, files in os.walk(path):
for momo in dirs:
- os.chown(
- for momo in files:
- os.chown(
+ os.lchown(
+ for momo in files:
+ os.lchown(
@contextmanager
Index: charmhelpers/ contrib/ cloudfoundry/ upstart_ helper. py contrib/ cloudfoundry/ upstart_ helper. py' contrib/ cloudfoundry/ upstart_ helper. py 2014-04-01 07:40:02 contrib/ cloudfoundry/ upstart_ helper. py 2014-04-16 14:51:10 core.hookenv import charm_dir contrib. cloudfoundry. install import install
=== modified file 'charmhelpers/
--- charmhelpers/
+0000
+++ charmhelpers/
+0000
@@ -1,13 +1,13 @@
import os
import glob
from charmhelpers.core import hookenv
-from charmhelpers.
from charmhelpers.
-def install_ upstart_ scripts( dirname= os.path. join(hookenv. charm_dir( ), upstart_ scripts( dirname= None,
pattern= '*.conf' ): join(hookenv. charm_dir( ), 'files/upstart') join(dirname, script)
hookenv. log('Installing upstart job:' + filename, hookenv.DEBUG)
- 'files/upstart'),
+def install_
+ if dirname is None:
+ dirname = os.path.
for script in glob.glob("%s/%s" % (dirname, pattern)):
filename = os.path.