Merge tag 'upstream/5.3'

Upstream version 5.3

1 files changed, 23 insertions, 20 deletions

diff --git a/setup.py b/setup.py
index c86b45c..2ff115f 100644
--- a/setup.py
+++ b/setup.py
@@ -70,27 +70,30 @@ def copy_messages():
 
 
 def install_manpages(root, prefix):
-    man_pages = [
-        ('docs/man/nikola.1', 'share/man/man1/nikola.1'),
-    ]
-    join = os.path.join
-    normpath = os.path.normpath
-    if root is not None:
-        prefix = os.path.realpath(root) + os.path.sep + prefix
-    for src, dst in man_pages:
-        path_dst = join(normpath(prefix), normpath(dst))
-        try:
-            os.makedirs(os.path.dirname(path_dst))
-        except OSError:
-            pass
-        rst2man_cmd = ['rst2man.py', 'rst2man']
-        for rst2man in rst2man_cmd:
+    try:
+        man_pages = [
+            ('docs/man/nikola.1', 'share/man/man1/nikola.1'),
+        ]
+        join = os.path.join
+        normpath = os.path.normpath
+        if root is not None:
+            prefix = os.path.realpath(root) + os.path.sep + prefix
+        for src, dst in man_pages:
+            path_dst = join(normpath(prefix), normpath(dst))
             try:
-                subprocess.call([rst2man, src, path_dst])
+                os.makedirs(os.path.dirname(path_dst))
             except OSError:
-                continue
-            else:
-                break
+                pass
+            rst2man_cmd = ['rst2man.py', 'rst2man']
+            for rst2man in rst2man_cmd:
+                try:
+                    subprocess.call([rst2man, src, path_dst])
+                except OSError:
+                    continue
+                else:
+                    break
+    except Exception as e:
+        print("Not installing the man pages:", e)
 
 
 class nikola_install(install):
@@ -179,7 +182,7 @@ def find_package_data(
     return out
 
 setup(name='Nikola',
-      version='5.2',
+      version='5.3',
       description='Static blog/website generator',
       author='Roberto Alsina and others',
       author_email='ralsina@netmanagers.com.ar',