Merge lp:~rafalcieslak256/ubuntu-accomplishments-daemon/more-paths into lp:ubuntu-accomplishments-daemon

[Rafał Cieślak]

This branch introduces small additions to util/paths.py, that make it straightforward for other scripts (including viewer) to learn more about daemon's paths. This includes providing them with deamon_exec_dir, which is the path to the right daemon launcher - the one that has been installed with this API, and locale_dir - path to directory where locale .gmo files has been installed. This will work for both packaged & manually installed (to any prefix) daemon.

This is a crucial change needed to fix in #982047 "Starting the daemon from the client is broken for packages" and #983356 "gettext uses locales from wrong directory" in the Viewer.

=== modified file 'accomplishments/util/paths.py'
--- accomplishments/util/paths.py	2012-04-15 16:16:49 +0000
+++ accomplishments/util/paths.py	2012-04-16 20:37:18 +0000
@@ -1,11 +1,6 @@
 import os
 
-if __file__[0] is '/':
-    #the script run with absolute path
-    scriptpath = __file__
-else:
-    scriptpath = os.path.join(os.getcwd(),__file__)
-    
+scriptpath = os.path.abspath(__file__)
 # okay, so as we have the full path, we're ready to analise it...    
 
 # start by looking 2 levels higher. This is either the branch directory,
@@ -29,10 +24,18 @@
     # finally, setting these significant data directories...
     systemdata_dir = os.path.join(basepath, 'share/accomplishments-daemon')
     media_dir      = os.path.join(basepath, 'share/accomplishments-daemon/media')
+    
     # these two may need to be set for the accomplismhents scripts, so that they
     # can use OUR accomplishments module, using this installation.
     module_dir1    = os.path.join(basepath, 'lib/python2.7/site-packages') 
     module_dir2    = os.path.join(basepath, 'lib/python2.7/dist-packages')
+    
+    # that's where the daemon launcher is present
+    daemon_exec_dir= os.path.join(basepath, 'bin')
+    
+    # locale files directory
+    locale_dir= os.path.join(basepath, 'share/locale')
+    
 else:
     # using branch root directory as the base path
     basepath = branchpath
@@ -43,3 +46,13 @@
     media_dir      = os.path.join(basepath, 'data/media')
     module_dir1    = None # always using default
     module_dir2    = None # always using default
+    
+    # that's where the daemon launcher is present
+    daemon_exec_dir= os.path.join(basepath, 'bin')
+    
+    # If the application has not been installed, the .po files has not been
+    # complied to .gmo, and thus gettext will be unable to use translated
+    # strings. In this case it does not matter where it will look for locales,
+    # but if it's left to default there is some small chance that they are
+    # present int /usr/share/locale, used by an another installation.
+    locale_dir = None