Merge lp:~adeuring/charmworld/proof-lib-path into lp:~juju-jitsu/charmworld/trunk

[Abel Deuring]

Try two possible locations for the charm-tools library.

Running ingest with up-to-date packages leads to the error message "No proofer".

The reason is that charmworld.jobs.config specifies the location for the library as '/usr/share/charm-tools/scripts' (correct for older versions od the charm-tools package), while recent version of this package from the juju PPA store the libraries in /usr/lib/python2.7/dist-packages/charmtools .

This branch checks if the new directory exists and if so, uses it.

[Benji York (benji)]

The branch looks good.

I would capitalize the sentence on line 9 of the diff.

review: Approve

[lp:~adeuring/charmworld/proof-lib-path]

403. By Abel Deuring on 2013-10-02

typo fixed.

[Abel Deuring (adeuring)]

review: Approve

[Aaron Bentley (abentley)]

Also at 9, it should be "version", not "verion".

[lp:~adeuring/charmworld/proof-lib-path]

404. By Abel Deuring on 2013-10-07

antoher typo fixed.

=== modified file 'charmworld/jobs/config.py'
--- charmworld/jobs/config.py	2013-07-18 20:25:16 +0000
+++ charmworld/jobs/config.py	2013-10-07 10:17:39 +0000
@@ -28,7 +28,10 @@
                  settings.get('mongo.port')))
 DB_NAME = settings.get('mongo.database')
 
-CHARM_PROOF_PATH = '/usr/share/charm-tools/scripts'
+# The charm-tools library location changed in version 1.0.
+CHARM_PROOF_PATH = '/usr/lib/python2.7/dist-packages/charmtools'
+if not os.path.isdir(CHARM_PROOF_PATH):
+    CHARM_PROOF_PATH = '/usr/share/charm-tools/scripts/lib'
 
 STORE_URL = 'https://store.juju.ubuntu.com'
 

=== modified file 'charmworld/jobs/ingest.py'
--- charmworld/jobs/ingest.py	2013-09-04 22:56:40 +0000
+++ charmworld/jobs/ingest.py	2013-10-07 10:17:39 +0000
@@ -476,7 +476,7 @@
     if new_path not in sys.path:
         sys.path.append(new_path)
     try:
-        import lib.proof as prooflib
+        import proof as prooflib
         yield prooflib
     except ImportError:
         yield None