Merge branch 'release-0.4.1'

Conflicts:
	mediagoblin/_version.py

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 0ee6b5b40bee4164bba1fa823b9daedce05a4cef..9d7f83c13b9be773b18199142464698dc6d6279e 100644 (file)
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -157,9 +157,10 @@ directory. Modify these commands to reflect your own environment::
     mkdir -p /srv/mediagoblin.example.org/
     cd /srv/mediagoblin.example.org/
 
-Clone the MediaGoblin repository::
+Clone the MediaGoblin repository and set up the git submodules::
 
     git clone git://gitorious.org/mediagoblin/mediagoblin.git
+    git submodule init && git submodule fetch
 
 And set up the in-package virtualenv::
 
@@ -194,7 +195,7 @@ This concludes the initial configuration of the development
 environment. In the future, when you update your
 codebase, you should also run::
 
-    ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate
+    ./bin/python setup.py develop --upgrade && ./bin/gmg dbupdate && git submodule fetch
 
 Note: If you are running an active site, depending on your server
 configuration, you may need to stop it first or the dbupdate command

diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst
index 7ae305a7ea7446c4311f5d4fcc06f0ee5f6fa158..b49d165474658d039392cf3b9624609eb42b1974 100644 (file)
--- a/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@ -21,6 +21,19 @@ This chapter has important information for releases in it.
 If you're upgrading from a previous release, please read it
 carefully, or at least skim over it.
 
+0.4.1
+=====
+
+This is a bugfix release for 0.4.0.  This only implements one major
+fix in the newly released document support which prevented the
+"conversion via libreoffice" feature.
+
+If you were running 0.4.0 you can upgrade to v0.4.1 via a simple
+switch and restarting mediagoblin/celery with no other actions.
+
+Otherwise, follow 0.4.0 instructions.
+
+
 0.4.0
 =====
 
@@ -47,6 +60,9 @@ carefully, or at least skim over it.
 5. We now use itsdangerous for sessions; if you had any references to
    beaker in your paste config you can remove them.  Again, see the
    default paste.ini config
+6. We also now use git submodules.  Please do:
+   ``git submodule init && git submodule fetch``
+   You will need to do this to use the new PDF support.
 
 **For theme authors**
 

diff --git a/mediagoblin/_version.py b/mediagoblin/_version.py
index 2abc105ff9f48a38641c43cdfd3ae9ce7ecefb1b..94629775ea7e33d61295fc1e27613c4d335207ab 100644 (file)
--- a/mediagoblin/_version.py
+++ b/mediagoblin/_version.py
@@ -23,4 +23,4 @@
 
 # see http://www.python.org/dev/peps/pep-0386/
 
-__version__ = "0.4.1.dev"
+__version__ = "0.5.0.dev"

diff --git a/mediagoblin/media_types/pdf/processing.py b/mediagoblin/media_types/pdf/processing.py
index 49742fd72256d7f4baf01717252d6434602e4ac8..b5adb5e6fd7405ac201bf12737954abf0af55bf3 100644 (file)
--- a/mediagoblin/media_types/pdf/processing.py
+++ b/mediagoblin/media_types/pdf/processing.py
@@ -250,8 +250,8 @@ def process_pdf(proc_state):
     else:
         pdf_filename = queued_filename.rsplit('.', 1)[0] + '.pdf'
         unoconv = where('unoconv')
-        call(executable=unoconv,
-             args=[unoconv, '-v', '-f', 'pdf', queued_filename])
+        Popen(executable=unoconv,
+              args=[unoconv, '-v', '-f', 'pdf', queued_filename]).wait()
         if not os.path.exists(pdf_filename):
             _log.debug('unoconv failed to convert file to pdf')
             raise BadMediaFail()

diff --git a/setup.py b/setup.py
index aaf5cda9e1f35a89956bf8f1e1ad3fe9093cae0f..6e026f30b6997257d931b9733ce8d0af4addde99 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ setup(
         'PasteScript',
         'wtforms',
         'py-bcrypt',
-        'pytest>=2.3',
+        'pytest>=2.3.1',
         'pytest-xdist',
         'werkzeug>=0.7',
         'celery==2.5.3',