[conduit] Check if shotwell is installed first



commit 7fba7996e4dd4b3e93cf39031af5434e58e56eb4
Author: John Stowers <john stowers gmail com>
Date:   Wed Sep 8 21:51:30 2010 +1200

    Check if shotwell is installed first

 conduit/modules/ShotwellModule/ShotwellModule.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/conduit/modules/ShotwellModule/ShotwellModule.py b/conduit/modules/ShotwellModule/ShotwellModule.py
index b35a54d..2387c44 100644
--- a/conduit/modules/ShotwellModule/ShotwellModule.py
+++ b/conduit/modules/ShotwellModule/ShotwellModule.py
@@ -14,9 +14,13 @@ except ImportError:
     Utils.dataprovider_add_dir_to_path(__file__)
     import shotwell
 
-MODULES = {
-    "ShotwellDataProvider" : { "type": "dataprovider" }
-}
+if Utils.program_installed("shotwell"):
+    MODULES = {
+        "ShotwellDataProvider" : { "type": "dataprovider" }
+    }
+else:
+    MODULES = {}
+    log.info("Shotwell not installed")
 
 # Why is this not in the standard library?
 def _flatten(lst):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]