Merge pull request #5575 from jmarrero/upgrade-r2

deploy: Print status message on container early-return path

Author: jmarrero

src/daemon/rpmostreed-transaction-types.cxx

@@ -1603,7 +1603,13 @@ deploy_transaction_execute (RpmostreedTransaction *transaction, GCancellable *ca
    * need to continue to deploy. */
   const bool have_refspec_or_revision = self->refspec || self->revision;
   if (skip_base_check && !changed && !have_refspec_or_revision)
-    return TRUE;
+    {
+      if (is_upgrade)
+        rpmostree_output_message ("No upgrade available.");
+      else
+        rpmostree_output_message ("No change.");
+      return TRUE;
+    }
 
   if (dry_run)
     /* Note early return here; we printed the transaction already */

tests/kolainst/destructive/idempotent-layering

@@ -265,6 +265,14 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
     assert_streq "${rc}" "77"
     echo "ok upgrade --unchanged-exit-77 reports no change when already up to date"
 
+    # Test 9: Verify upgrade prints "No upgrade available." when already up to date
+    # Regression test for https://github.com/coreos/rpm-ostree/issues/5574
+    # Before this fix, container-based systems would exit silently with code 0
+    # without printing any message when no upgrade was available.
+    rpm-ostree upgrade 2>&1 | tee upgrade-output.txt
+    assert_file_has_content upgrade-output.txt "No upgrade available."
+    echo "ok upgrade prints 'No upgrade available.' on container-based system"
+
     ;;
   *) echo "unexpected mark: ${AUTOPKGTEST_REBOOT_MARK}"; exit 1;;
 esac