Merge lp:~rafalcieslak256/ubuntu-accomplishments-viewer/982246 into lp:ubuntu-accomplishments-viewer

[Rafał Cieślak]

This branch is meant to fix #982246 in the viewer, by introducing proper PATH setting.

This merge is related to https://code.launchpad.net/~rafalcieslak256/ubuntu-accomplishments-daemon/982246/+merge/102030, it fixes the same problem in the daemon.

The client-side fix turned out to be much simpler, as it is enough to repair the PATH in bin/accomplishment-viewer launcher. The problem was that the launcher was setting the path correctly only if it was installed to /opt/extras.ubuntu.com/accomplishments-viewer, I made it simply add the required locations based on PROJECT_ROOT_DIRECTORY.

===
That change introduces one more great feature:
It is now possible to pair a certain version of daemon/client. By installing BOTH the daemon and client to the same directory one can be sure that the client will use the api files from exactly that daemon installation.

Also, although I have not checked it because I do not have these packaging scripts, I think it may be beneficial when it comes to packaging. I'm unsure of how it works with python, but e.g. autotools love to set their custom prefix for packages, and supporting that within the app's code is a desired feature.

===
The next step would be to fix #982047 so that it works not only in packages, but in any installation :-)

=== modified file 'bin/accomplishments-viewer'
--- bin/accomplishments-viewer	2012-04-10 04:29:26 +0000
+++ bin/accomplishments-viewer	2012-04-15 15:34:19 +0000
@@ -15,6 +15,17 @@
 PROJECT_ROOT_DIRECTORY = os.path.abspath(
     os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
 
+# Prepate paths for importing modules
+sys.path.insert(0,os.path.join(PROJECT_ROOT_DIRECTORY,'lib/python2.7/site-packages'))
+sys.path.insert(0,os.path.join(PROJECT_ROOT_DIRECTORY,'lib/python2.7/dist-packages'))
+os.environ["PYTHONPATH"] = "$PYTHONPATH:."
+os.environ['PYTHONPATH'] = os.path.join(PROJECT_ROOT_DIRECTORY,'lib/python2.7/site-packages') + ":" + os.environ['PYTHONPATH']
+os.environ['PYTHONPATH'] = os.path.join(PROJECT_ROOT_DIRECTORY,'lib/python2.7/dist-packages') + ":" + os.environ['PYTHONPATH']
+      
+# Original code, left for convenience. Reasons why it is discarted:
+# - It supports installation only in /opt/extras.ubuntu.com/accomplishments-viewer
+# - It does not set site-packages directory, which seems to be nessesary
+"""
 python_path = []
 if os.path.abspath(__file__).startswith('/opt'):
     syspath = sys.path[:] # copy to avoid infinite loop in pending objects
@@ -28,6 +39,7 @@
     sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
 if python_path:
     os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
+"""
 
 import accomplishments_viewer
 accomplishments_viewer.main()