From 750cc539a099775c3f1889ed3bec9f1abc6b493a Mon Sep 17 00:00:00 2001 From: ehb54 Date: Thu, 11 Jan 2024 13:03:57 -0700 Subject: [PATCH] us.cpp: skip notices with version.revision less than our running version --- programs/us/us.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/programs/us/us.cpp b/programs/us/us.cpp index 90646782b..80c158daf 100644 --- a/programs/us/us.cpp +++ b/programs/us/us.cpp @@ -974,11 +974,24 @@ qDebug() << " n_dif" << n_dif << "time_d" << time_d << "pn_time" << pn_time; bool empty_msg = true; + double sys_version = US_Version.toDouble(); + int sys_revision = QString( REVISION ).toInt(); + for ( int ii = 0; ii < nnotice; ii++ ) { - // Skip messages for warn/crit same revision or any earlier than current - if ( ( irevs[ ii ] == s_rev && types[ ii ] != "info" ) || - irevs[ ii ] < s_rev ) continue; + double msg_version = QString( "%1" ).arg( revs[ii] ).replace( QRegularExpression( "\\.\\d+$" ), "" ).toDouble(); + double msg_revision = QString( "%1" ).arg( revs[ii] ).replace( QRegularExpression( "^[^\\.]*\\.\\d+\\." ), "" ).toDouble(); + + // // Skip messages for warn/crit same revision or any earlier than current + // if ( ( irevs[ ii ] == s_rev && types[ ii ] != "info" ) || + // irevs[ ii ] < s_rev ) continue; + + // Skip messages where message version.revision is less than our version.revision + if ( sys_version > msg_version || + ( sys_version == msg_version && + sys_revision > msg_revision ) ) { + continue; + } // Add current message to full text msg_note += typeMap[ types[ ii ] ] + " for release "