From 59cc8c6c7bfa6456f21d758091585a8ac11276b9 Mon Sep 17 00:00:00 2001
From: Eric Callahan <arksine.code@gmail.com>
Date: Thu, 20 Oct 2022 10:57:02 -0400
Subject: [PATCH] update_manager: report errors in update response

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
---
 moonraker/components/update_manager/git_deploy.py     | 4 ++--
 moonraker/components/update_manager/update_manager.py | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/moonraker/components/update_manager/git_deploy.py b/moonraker/components/update_manager/git_deploy.py
index 7647032..db7ed8d 100644
--- a/moonraker/components/update_manager/git_deploy.py
+++ b/moonraker/components/update_manager/git_deploy.py
@@ -159,7 +159,7 @@ class GitDeploy(AppDeploy):
                 await self.repo.reset()
             else:
                 await self.repo.pull()
-        except Exception:
+        except Exception as e:
             if self.repo.repo_corrupt:
                 self._is_valid = False
                 self._save_state()
@@ -167,7 +167,7 @@ class GitDeploy(AppDeploy):
                 event_loop.delay_callback(
                     .2, self.cmd_helper.notify_update_refreshed
                 )
-            raise self.log_exc("Error updating git repo")
+            raise self.log_exc(str(e))
 
     async def _update_dependencies(self,
                                    inst_hash: Optional[str],
diff --git a/moonraker/components/update_manager/update_manager.py b/moonraker/components/update_manager/update_manager.py
index 5f1a3e6..0dca628 100644
--- a/moonraker/components/update_manager/update_manager.py
+++ b/moonraker/components/update_manager/update_manager.py
@@ -285,9 +285,7 @@ class UpdateManager:
                     await updater.update()
             except Exception as e:
                 self.cmd_helper.notify_update_response(
-                    f"Error updating {app}")
-                self.cmd_helper.notify_update_response(
-                    str(e), is_complete=True)
+                    f"Error updating {app}: {e}", is_complete=True)
                 raise
             finally:
                 self.cmd_helper.clear_update_info()
@@ -352,11 +350,9 @@ class UpdateManager:
                 self.cmd_helper.notify_update_response(
                     "Full Update Complete", is_complete=True)
             except Exception as e:
-                self.cmd_helper.notify_update_response(
-                    f"Error updating {app_name}")
                 self.cmd_helper.set_full_complete(True)
                 self.cmd_helper.notify_update_response(
-                    str(e), is_complete=True)
+                    f"Error updating {app_name}: {e}", is_complete=True)
             finally:
                 self.cmd_helper.clear_update_info()
             return "ok"