Merge branch 'main' into fix-ci

ublue-os · Aug 4, 2024 · 4d05b7a · 4d05b7a
2 parents 1635cca + 2e8c9d2
commit 4d05b7a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...temd/system-preset/00-ublue-update.preset → ...temd/system-preset/60-ublue-update.preset b/...temd/system-preset/00-ublue-update.preset → ...temd/system-preset/60-ublue-update.preset
diff --git a/src/ublue_update/cli.py b/src/ublue_update/cli.py
@@ -247,4 +247,8 @@ def main():
 
     # system checks passed
     log.info("System passed all update checks")
-    run_updates(cli_args.system, system_update_available)
+    try:
+        run_updates(cli_args.system, system_update_available)
+    except Exception as e:
+        log.info(f"Failed to update: {e}")
+        os._exit(1)
diff --git a/ublue-update.spec b/ublue-update.spec
@@ -68,7 +68,7 @@ fi
 %attr(0755,root,root) %{_bindir}/%{name}
 %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system/%{NAME}.service
 %attr(0644,root,root) %{_exec_prefix}/lib/systemd/system/%{NAME}.timer
-%attr(0644,root,root) %{_exec_prefix}/lib/systemd/system-preset/00-%{NAME}.preset
+%attr(0644,root,root) %{_exec_prefix}/lib/systemd/system-preset/60-%{NAME}.preset
 %attr(0644,root,root) %{_exec_prefix}/etc/%{NAME}/*.toml
 %attr(0644,root,root) %{_datadir}/%{NAME}/*.toml
 %attr(0644,root,root) %{_datadir}/polkit-1/rules.d/%{NAME}.rules