Merge lp:~sajoupa/mojo/fonts-mojo-spec-update-content into lp:mojo/mojo-specs

[Laurent Sesquès]

[Tom Haddon (mthaddon)]

Looks good, will merge

review: Approve

=== modified file 'font-ubuntu-com/manifest-update-content'
--- font-ubuntu-com/manifest-update-content	2016-01-04 10:26:48 +0000
+++ font-ubuntu-com/manifest-update-content	2016-01-04 13:53:11 +0000
@@ -3,7 +3,7 @@
 # Run the build step
 build
 # Upload our built resources
-script config=upload-built-content
+script config=upload-built-content.sh
 # Upgrade apache content
 script config=upgrade_charm_apache_content
 # Wait for Juju to be finished

=== modified file 'font-ubuntu-com/scripts/upgrade_charm_apache_content'
--- font-ubuntu-com/scripts/upgrade_charm_apache_content	2016-01-04 10:26:48 +0000
+++ font-ubuntu-com/scripts/upgrade_charm_apache_content	2016-01-04 13:53:11 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import os
 import utils.mojo_utils as mojo_utils
 
 mojo_utils.upgrade_charm('ubuntu-font-content', os.environ['MOJO_REPO_DIR'])

=== modified file 'mojo-spec-helpers/utils/mojo_utils.py'
--- mojo-spec-helpers/utils/mojo_utils.py	2016-01-04 10:26:48 +0000
+++ mojo-spec-helpers/utils/mojo_utils.py	2016-01-04 13:53:11 +0000
@@ -8,7 +8,7 @@
 import time
 from collections import Counter
 from swiftclient.client import Connection
-from mojo import Project
+from mojo.project import Project
 from jinja2 import Template
 
 JUJU_STATUSES = {