diff --git a/rpkg.macros b/rpkg.macros index 8502571..c1f62b0 100644 --- a/rpkg.macros +++ b/rpkg.macros @@ -1,6 +1,6 @@ function ublue_update_version { if [ "$GITHUB_REF_NAME" = "" ]; then - echo "1.1.0+$(git rev-parse --short HEAD)" + echo "1.1.1+$(git rev-parse --short HEAD)" else echo "$GITHUB_REF_NAME" fi diff --git a/src/ublue_update/cli.py b/src/ublue_update/cli.py index a0d7b75..a8e501e 100644 --- a/src/ublue_update/cli.py +++ b/src/ublue_update/cli.py @@ -167,7 +167,7 @@ def run_updates(system, system_update_available): ) log.debug(out.stdout.decode("utf-8")) log.info("System update complete") - if pending_deployment_check() and system_update_available: + if pending_deployment_check() and system_update_available and dbus_notify: out = notify( "System Updater", "System update complete, pending changes will take effect after reboot. Reboot now?", diff --git a/src/ublue_update/update_checks/system.py b/src/ublue_update/update_checks/system.py index de93cf3..c83bbe6 100644 --- a/src/ublue_update/update_checks/system.py +++ b/src/ublue_update/update_checks/system.py @@ -35,6 +35,9 @@ def system_update_check(): protocol = "docker://" url = current_image[1] + if url == "oci:/var/ublue-os/image": + return True + """Add protocol if URL doesn't contain it""" if protocol not in url: url = protocol + url