Merge lp:~joetalbott/uci-engine/django-requirements-missing into lp:uci-engine

[Joe Talbott]

python-django - Don't try to read non-existent requirements files.

python-django - Don't try to read non-existent requirements files.

[Evan (ev)]

Straightforward enough. +1

review: Approve

[Andy Doan (doanac)]

Can you explain the bug you are seeing. Seems like this would have been
busted code forever?

[Joe Talbott (joetalbott)]

For me (on lxc) all django charms were failing on the install hook when trying to open the default requirements files. This might be a change in the default for juju-deployer (or whichever piece it is that handles the default value for requiremensts_pip_files in the yaml files.)

[Andy Doan (doanac)]

that's wild. i guess this can't hurt.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:453
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/569/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/569/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:453
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/575/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/575/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:453
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/578/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/578/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

453. By Joe Talbott on 2014-05-01

python-django - Don't try to read requirements files that don't exist.

=== modified file 'charms/precise/python-django/fabfile.py'
--- charms/precise/python-django/fabfile.py	2014-01-29 20:13:31 +0000
+++ charms/precise/python-django/fabfile.py	2014-05-01 15:47:46 +0000
@@ -96,7 +96,8 @@
     """
     with cd(env.project_dir):
         for req_file in env.conf['requirements_apt_files'].split(','):
-            sudo("apt-get install -y $(cat %s | tr '\\n' ' '" % req_file)
+            if os.path.exists(req_file):
+                sudo("apt-get install -y $(cat %s | tr '\\n' ' '" % req_file)
 
 # Python
 @task
 
=== modified file 'charms/precise/python-django/hooks/hooks.py'
--- charms/precise/python-django/hooks/hooks.py	2014-03-26 14:22:52 +0000
+++ charms/precise/python-django/hooks/hooks.py	2014-05-01 15:47:46 +0000
@@ -544,7 +544,8 @@
 
     if requirements_pip_files:
        for req_file in requirements_pip_files.split(','):
-            pip_install_req(os.path.join(working_dir,req_file))
+            if os.path.exists(req_file):
+                pip_install_req(os.path.join(working_dir,req_file))
 
     wsgi_py_path = os.path.join(working_dir, 'wsgi.py')
     if not os.path.exists(wsgi_py_path):
@@ -626,7 +627,8 @@
 
     if requirements_pip_files:
        for req_file in requirements_pip_files.split(','):
-            pip_install_req(os.path.join(working_dir,req_file), upgrade=True)
+            if os.path.exists(req_file):
+                pip_install_req(os.path.join(working_dir,req_file), upgrade=True)
 
 
     # Trigger WSGI reloading