Merge lp:~dholbach/ubuntu-accomplishments-daemon/paths-fix into lp:~jonobacon/ubuntu-accomplishments-daemon/ubuntu-accomplishments-daemon

[Daniel Holbach]

This should install the GPG key in the right place and tests where we are
running from (from branch or from system libs) when starting the daemon.

[lp:~dholbach/ubuntu-accomplishments-daemon/paths-fix]

117. By Daniel Holbach on 2012-04-10

update potfile

118. By Daniel Holbach on 2012-04-10

check for .png files in the right place depending on where we run the daemon from

119. By Daniel Holbach on 2012-04-11

merge from trunk

120. By Daniel Holbach on 2012-04-11

run daemon with -y instead of -noy

121. By Daniel Holbach on 2012-04-11

look for media files in media_dir - which depends on where we run the daemon from

Unmerged revisions

121. By Daniel Holbach on 2012-04-11

look for media files in media_dir - which depends on where we run the daemon from

120. By Daniel Holbach on 2012-04-11

run daemon with -y instead of -noy

119. By Daniel Holbach on 2012-04-11

merge from trunk

118. By Daniel Holbach on 2012-04-10

check for .png files in the right place depending on where we run the daemon from

117. By Daniel Holbach on 2012-04-10

update potfile

116. By Daniel Holbach on 2012-04-10

install gpg key into /usr/share/ and test if we are running from branch or not

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-04-09 20:15:10 +0000
+++ accomplishments/daemon/api.py	2012-04-10 08:26:18 +0000
@@ -44,7 +44,7 @@
 from accomplishments import exceptions
 from accomplishments.daemon import dbusapi
 from accomplishments.util import get_data_file, SubprocessReturnCodeProtocol
-
+from accomplishments.util.paths import media_dir
 
 MATRIX_USERNAME = "openiduser155707"
 LOCAL_USERNAME = getpass.getuser()
@@ -543,9 +543,7 @@
                 os.remove(o)
 
             # now generate our trophy images
-            lock_image_path = os.path.join(
-                os.path.dirname(accomplishments.__path__[0]),
-                "data/media/lock.png")
+            lock_image_path = os.path.join(media_dir, "lock.png")
             self.generate_trophy_images(
                 app_trophyimagespath, cache_trophyimagespath, lock_image_path)
 
@@ -729,8 +727,7 @@
             pynotify.is_initted() or pynotify.init("icon-summary-body")):
                 # XXX: need to fix loading the right icon
                 trophy_icon_path = "file://%s" % os.path.realpath(
-                    os.path.join(
-                        os.path.split(__file__)[0], "unlocked.png"))
+                    os.path.join(media_dir, "unlocked.png"))
                 n = pynotify.Notification(_("You have accomplished something!"),
                     data["title"], trophy_icon_path)
                 n.show()

=== added file 'accomplishments/util/paths.py'
--- accomplishments/util/paths.py	1970-01-01 00:00:00 +0000
+++ accomplishments/util/paths.py	2012-04-10 08:26:18 +0000
@@ -0,0 +1,11 @@
+import os
+
+def uses_system_lib():
+    return os.path.dirname(__file__).startswith("/usr")
+
+runs_in_branch = not uses_system_lib()
+systemdata_dir = "data/daemon/"
+media_dir      = "data/media/"
+if not runs_in_branch:
+    systemdata_dir = "/usr/share/accomplishments-daemon/"
+    media_dir      = "/usr/share/accomplishments-daemon/media/"

=== modified file 'bin/accomplishments-daemon'
--- bin/accomplishments-daemon	2012-04-08 22:11:10 +0000
+++ bin/accomplishments-daemon	2012-04-10 08:26:18 +0000
@@ -1,8 +1,9 @@
-#!/usr/bin/twistd
+#!/usr/bin/twistd -noy
 """
 Run the Accomplishments daemon!
 """
 import sys
+import os
 
 from twisted.internet import glib2reactor
 glib2reactor.install()
@@ -11,10 +12,12 @@
 from dbus.mainloop.glib import DBusGMainLoop
 
 from accomplishments.daemon import app
-
-
-# PYTHONPATH mangling
-sys.path.insert(0, ".")
+from accomplishments.util import paths
+
+
+if paths.runs_in_branch:
+    # PYTHONPATH mangling
+    sys.path.insert(0, ".")
 
 dbus_loop = DBusGMainLoop(set_as_default=True)
 application = app.applicationFactory(
@@ -25,4 +28,4 @@
     object_path="/",
     # Let's execute the timer service every 15 minutes
     update_interval=15 * 60,
-    gpg_key="./data/daemon/validation-key.pub")
+    gpg_key=os.path.join(paths.systemdata_dir, "validation-key.pub"))

=== modified file 'debian/copyright'
--- debian/copyright	2012-04-09 04:52:29 +0000
+++ debian/copyright	2012-04-10 08:26:18 +0000
@@ -5,6 +5,7 @@
 
 Files: *
 Copyright: (C) 2012 Jono Bacon <[e-mail]>
+Copyright: (C) 2012 Rosetta Contributors and Canonical Ltd 2012
 License: GPL-3
  The full text of the GPL is distributed in
  /usr/share/common-licenses/GPL-3 on Debian systems.

=== modified file 'po/accomplishments-daemon.pot'
--- po/accomplishments-daemon.pot	2012-04-09 06:08:40 +0000
+++ po/accomplishments-daemon.pot	2012-04-10 08:26:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-08 23:07-0700\n"
+"POT-Creation-Date: 2012-04-10 10:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,6 +17,10 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../accomplishments/daemon/api.py:102 ../accomplishments/daemon/api.py:731
+msgid "You have accomplished something!"
+msgstr ""
+
 #: ../accomplishments/util/__init__.py:88
 msgid "Show debug messages (-vv debugs accomplishments_daemon_lib also)"
 msgstr ""
@@ -24,7 +28,3 @@
 #: ../accomplishments/util/__init__.py:91
 msgid "Clear your trophies collection"
 msgstr ""
-
-#: ../accomplishments/daemon/api.py:100 ../accomplishments/daemon/api.py:732
-msgid "You have accomplished something!"
-msgstr ""

=== modified file 'setup.py'
--- setup.py	2012-04-09 04:52:29 +0000
+++ setup.py	2012-04-10 08:26:18 +0000
@@ -15,5 +15,8 @@
     description='Daemon for Ubuntu Accomplishments.',
     long_description='Daemon for Ubuntu Accomplishments.',
     url='https://launchpad.net/ubuntu-accomplishments-daemon',
-    cmdclass={'install': dist.InstallAndUpdateDataDirectory}
-    )
+    cmdclass={'install': dist.InstallAndUpdateDataDirectory},
+    data_files=[
+        ('share/accomplishments-daemon', ['data/daemon/validation-key.pub'])
+        ],
+)