Merge lp:~submarine/unity-scope-zotero/zotero-install-fix into lp:unity-scope-zotero

Proposed by Mark Tully on 2013-12-16
Status: Merged
Approved by: David Callé on 2013-12-17
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~submarine/unity-scope-zotero/zotero-install-fix
Merge into: lp:unity-scope-zotero
Diff against target: 33 lines (+4/-2)
2 files modified
po/unity-scope-zotero.pot (+2/-2)
src/unity_zotero_daemon.py (+2/-0)
To merge this branch: bzr merge lp:~submarine/unity-scope-zotero/zotero-install-fix
Reviewer Review Type Date Requested Status
David Callé 2013-12-16 Approve on 2013-12-16
PS Jenkins bot (community) continuous-integration Approve on 2013-12-16
Review via email: mp+199065@code.launchpad.net

Commit message

Fixes issue where both Zotero Standalone and Zotero Firefox are required to be installed in order for results to be found

Description of the change

Fixes issue where both Zotero Standalone and Zotero Firefox are required to be installed in order for results to be found

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/unity-scope-zotero.pot'
2--- po/unity-scope-zotero.pot 2013-06-16 00:34:35 +0000
3+++ po/unity-scope-zotero.pot 2013-12-16 01:07:31 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2013-06-16 01:19+0100\n"
9+"POT-Creation-Date: 2013-10-20 23:42+0100\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -34,7 +34,7 @@
14 msgstr ""
15
16 #. Add the "View" action
17-#: ../src/unity_zotero_daemon.py:158
18+#: ../src/unity_zotero_daemon.py:160
19 msgid "View Article"
20 msgstr ""
21
22
23=== modified file 'src/unity_zotero_daemon.py'
24--- src/unity_zotero_daemon.py 2013-06-16 00:11:50 +0000
25+++ src/unity_zotero_daemon.py 2013-12-16 01:07:31 +0000
26@@ -99,6 +99,8 @@
27
28 dbFile = ""
29 for path in PATHS:
30+ if not os.path.exists(path):
31+ continue
32 for folder in [default for default in os.listdir(path) if default.endswith(".default")]:
33 dbFile = path + folder + "/zotero/zotero.sqlite"
34

Subscribers

People subscribed via source and target branches

to all changes: