From 226806e0fbbd01d9967b34567dfdb10b1a170d87 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 27 Feb 2024 12:53:59 +0100 Subject: [PATCH] RemoteLinux: Make deployment downgrade warning less spammy Keep the message, but make it a warning only for the "generic copy" case, which almost no one ever wants. Otherwise, it will annoy Windows users, who typically have no rsync installed. Change-Id: I2044b9ea2b199e03dc4e9421d05a2698d92ad76a Reviewed-by: hjk --- src/plugins/remotelinux/genericdeploystep.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/plugins/remotelinux/genericdeploystep.cpp b/src/plugins/remotelinux/genericdeploystep.cpp index bddc7bfcd3d..6071c4c8cae 100644 --- a/src/plugins/remotelinux/genericdeploystep.cpp +++ b/src/plugins/remotelinux/genericdeploystep.cpp @@ -155,11 +155,16 @@ GroupItem GenericDeployStep::transferTask(const Storage &storag } } if (!m_emittedDowngradeWarning && transferMethod != preferredTransferMethod) { - addWarningMessage(Tr::tr("Transfer method was downgraded from \"%1\" to \"%2\". If " - "this is unexpected, please re-test device \"%3\".") - .arg(FileTransfer::transferMethodName(preferredTransferMethod), - FileTransfer::transferMethodName(transferMethod), - deviceConfiguration()->displayName())); + const QString message + = Tr::tr("Transfer method was downgraded from \"%1\" to \"%2\". If " + "this is unexpected, please re-test device \"%3\".") + .arg(FileTransfer::transferMethodName(preferredTransferMethod), + FileTransfer::transferMethodName(transferMethod), + deviceConfiguration()->displayName()); + if (transferMethod == FileTransferMethod::GenericCopy) + addWarningMessage(message); + else + addProgressMessage(message); m_emittedDowngradeWarning = true; } transfer.setTransferMethod(transferMethod);