nabweb: fix Upgrade page crash when date was not set for 'Last check'.

nabaztag2018 · Jun 11, 2021 · 0619b82 · 0619b82
1 parent d18a5fb
commit 0619b82
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/nabweb/views.py b/nabweb/views.py
@@ -473,8 +473,10 @@ def do_get_repository_info(repository, relpath):
         if root_dir is None:
             return {
                 "status": "error",
-                "message": "Cannot find pynab installation from "
-                "Raspbian systemd services",
+                "message": "Cannot find Pynab installation from "
+                "OS systemd services",
+                "info_date": datetime.datetime.now(),
+                "name": GitInfo.NAMES[repository],
             }
         repo_dir = root_dir + "/" + relpath
         head_sha1 = (
@@ -485,6 +487,8 @@ def do_get_repository_info(repository, relpath):
                 "status": "error",
                 "message": "Cannot get HEAD - not a git repository? "
                 "Check /var/log/syslog",
+                "info_date": datetime.datetime.now(),
+                "name": GitInfo.NAMES[repository],
             }
         info = {}
         info["head"] = head_sha1
@@ -523,7 +527,10 @@ def do_get_repository_info(repository, relpath):
             != ""
         )
         info["tag"] = (
-            os.popen(f"cd {repo_dir} && git describe --long --tags")
+            os.popen(
+                f"cd {repo_dir} && git describe --long 2>/dev/null "
+                f"|| git describe --long --tags 2>/dev/null"
+            )
             .read()
             .strip()
         )
@@ -639,8 +646,8 @@ def post(self, request, *args, **kwargs):
         if root_dir is None:
             return {
                 "status": "error",
-                "message": "Cannot find pynab installation from "
-                "Raspbian systemd services",
+                "message": "Cannot find Pynab installation from "
+                "OS systemd services",
             }
         locked = (
             os.popen(