bigdata-dev team mailing list archive

[Cory Johns <cory.johns@xxxxxxxxxxxxx>]

Cory Johns has proposed merging lp:~johnsca/charms/trusty/apache-hadoop-plugin/venv-fix into lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/trunk.

Requested reviews:
  Juju Big Data Development (bigdata-dev)

For more details, see:
https://code.launchpad.net/~johnsca/charms/trusty/apache-hadoop-plugin/venv-fix/+merge/279286

It seems that hooks after install for the plugin charm are not using the venv, which is causing issues when using it with layered charms.
-- 
Your team Juju Big Data Development is requested to review the proposed merge of lp:~johnsca/charms/trusty/apache-hadoop-plugin/venv-fix into lp:~bigdata-dev/charms/trusty/apache-hadoop-plugin/trunk.

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-06-25 18:53:49 +0000
+++ hooks/config-changed	2015-12-02 14:59:11 +0000
@@ -11,5 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
 common.manage()

=== modified file 'hooks/hadoop-plugin-relation-changed'
--- hooks/hadoop-plugin-relation-changed	2015-06-25 18:53:49 +0000
+++ hooks/hadoop-plugin-relation-changed	2015-12-02 14:59:11 +0000
@@ -11,5 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
 common.manage()

=== modified file 'hooks/hadoop-plugin-relation-departed'
--- hooks/hadoop-plugin-relation-departed	2015-08-10 22:55:53 +0000
+++ hooks/hadoop-plugin-relation-departed	2015-12-02 14:59:11 +0000
@@ -11,5 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
 common.manage()

=== modified file 'hooks/namenode-relation-changed'
--- hooks/namenode-relation-changed	2015-06-25 18:53:49 +0000
+++ hooks/namenode-relation-changed	2015-12-02 14:59:11 +0000
@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
-
 common.manage()

=== modified file 'hooks/namenode-relation-departed'
--- hooks/namenode-relation-departed	2015-08-10 22:55:53 +0000
+++ hooks/namenode-relation-departed	2015-12-02 14:59:11 +0000
@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
-
 common.manage()

=== modified file 'hooks/resourcemanager-relation-changed'
--- hooks/resourcemanager-relation-changed	2015-06-25 18:53:49 +0000
+++ hooks/resourcemanager-relation-changed	2015-12-02 14:59:11 +0000
@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
-
 common.manage()

=== modified file 'hooks/resourcemanager-relation-departed'
--- hooks/resourcemanager-relation-departed	2015-08-10 22:55:53 +0000
+++ hooks/resourcemanager-relation-departed	2015-12-02 14:59:11 +0000
@@ -11,6 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
-
 common.manage()

=== modified file 'hooks/start'
--- hooks/start	2015-06-25 18:53:49 +0000
+++ hooks/start	2015-12-02 14:59:11 +0000
@@ -11,5 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
 common.manage()

=== modified file 'hooks/stop'
--- hooks/stop	2015-06-25 18:53:49 +0000
+++ hooks/stop	2015-12-02 14:59:11 +0000
@@ -11,5 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+execfile('.venv/bin/activate_this.py', {'__file__': '.venv/bin/activate_this.py'})
+
 import common
 common.manage()