Merge branch 'hotfix/0.24.2' into develop

CenterForOpenScience · Feb 10, 2018 · f50b16e · f50b16e
2 parents 4f9d119 + 22e1a7d
commit f50b16e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,10 @@
 ChangeLog
 *********
 
+0.24.2 (2018-02-09)
+===================
+- Fix: Update UNOCONV_BIN setting to reflect the default pip install path.
+
 0.24.1 (2018-02-09)
 ===================
 - Fix: Specifically install LibreOffice 6.0.1.1 and install unoconv 0.8.2.

diff --git a/mfr/__init__.py b/mfr/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.24.1'
+__version__ = '0.24.2'
 __import__('pkg_resources').declare_namespace(__name__)
diff --git a/mfr/extensions/unoconv/settings.py b/mfr/extensions/unoconv/settings.py
@@ -5,7 +5,7 @@
 
 config = settings.child('UNOCONV_EXTENSION_CONFIG')
 
-UNOCONV_BIN = config.get('UNOCONV_BIN', '/usr/bin/unoconv')
+UNOCONV_BIN = config.get('UNOCONV_BIN', '/usr/local/bin/unoconv')
 
 ADDRESS = config.get('SERVER', os.environ.get('UNOCONV_PORT_2002_TCP_ADDR', '127.0.0.1'))
 PORT = config.get('PORT', os.environ.get('UNOCONV_PORT_2002_TCP_PORT', '2002'))