Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libzypp-testsuite-tools for openSUSE:Factory checked in at 2026-03-06 18:21:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp-testsuite-tools (Old) and /work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new.561 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp-testsuite-tools" Fri Mar 6 18:21:38 2026 rev:60 rq:1337324 version:5.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp-testsuite-tools/libzypp-testsuite-tools.changes 2025-03-26 21:24:23.604930819 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new.561/libzypp-testsuite-tools.changes 2026-03-06 18:22:28.777842810 +0100 @@ -1,0 +2,6 @@ +Thu Jul 31 18:19:45 CEST 2025 - [email protected] + +- Require CMake 3.5 +- version 5.0.7 + +------------------------------------------------------------------- Old: ---- libzypp-testsuite-tools-5.0.6.tar.bz2 New: ---- libzypp-testsuite-tools-5.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-testsuite-tools.spec ++++++ --- /var/tmp/diff_new_pack.sOBhy8/_old 2026-03-06 18:22:30.745924707 +0100 +++ /var/tmp/diff_new_pack.sOBhy8/_new 2026-03-06 18:22:30.769925706 +0100 @@ -16,14 +16,14 @@ # Name: libzypp-testsuite-tools -Version: 5.0.6 +Version: 5.0.7 Release: 0 License: GPL-2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management - testsuite-tools Group: System/Packages Source: %{name}-%{version}.tar.bz2 -BuildRequires: cmake >= 3.1 +BuildRequires: cmake >= 3.17 BuildRequires: gcc-c++ >= 7 BuildRequires: libzypp-devel >= 17.25.3 ++++++ libzypp-testsuite-tools-5.0.6.tar.bz2 -> libzypp-testsuite-tools-5.0.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-testsuite-tools-5.0.6/CMakeLists.txt new/libzypp-testsuite-tools-5.0.7/CMakeLists.txt --- old/libzypp-testsuite-tools-5.0.6/CMakeLists.txt 2025-01-20 12:41:53.000000000 +0100 +++ new/libzypp-testsuite-tools-5.0.7/CMakeLists.txt 2025-07-31 18:02:22.000000000 +0200 @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.1) +CMAKE_MINIMUM_REQUIRED(VERSION 3.5) PROJECT( DEPTESTOMATIC C CXX ) SET( PACKAGE "libzypp-testsuite-tools" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-testsuite-tools-5.0.6/VERSION.cmake new/libzypp-testsuite-tools-5.0.7/VERSION.cmake --- old/libzypp-testsuite-tools-5.0.6/VERSION.cmake 2025-01-20 12:54:01.000000000 +0100 +++ new/libzypp-testsuite-tools-5.0.7/VERSION.cmake 2025-07-31 18:19:06.000000000 +0200 @@ -34,7 +34,7 @@ # SET(VERSION_MAJOR "5") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") -# LAST RELEASED: 5.0.6 +# LAST RELEASED: 5.0.7 #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-testsuite-tools-5.0.6/libzypp-testsuite-tools.spec.cmake new/libzypp-testsuite-tools-5.0.7/libzypp-testsuite-tools.spec.cmake --- old/libzypp-testsuite-tools-5.0.6/libzypp-testsuite-tools.spec.cmake 2020-12-04 16:00:52.000000000 +0100 +++ new/libzypp-testsuite-tools-5.0.7/libzypp-testsuite-tools.spec.cmake 2025-07-31 18:00:46.000000000 +0200 @@ -23,7 +23,7 @@ Summary: Package, Patch, Pattern, and Product Management - testsuite-tools Group: System/Packages Source: %{name}-%{version}.tar.bz2 -BuildRequires: cmake >= 3.1 +BuildRequires: cmake >= 3.17 BuildRequires: gcc-c++ >= 7 BuildRequires: libzypp-devel >= 17.25.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-testsuite-tools-5.0.6/package/libzypp-testsuite-tools.changes new/libzypp-testsuite-tools-5.0.7/package/libzypp-testsuite-tools.changes --- old/libzypp-testsuite-tools-5.0.6/package/libzypp-testsuite-tools.changes 2025-01-20 12:55:36.000000000 +0100 +++ new/libzypp-testsuite-tools-5.0.7/package/libzypp-testsuite-tools.changes 2025-07-31 18:21:28.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 31 18:19:45 CEST 2025 - [email protected] + +- Require CMake 3.5 +- version 5.0.7 + +------------------------------------------------------------------- Mon Jan 20 12:53:36 CET 2025 - [email protected] - Fixes to build with libzypp-17.35.17 and newer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-testsuite-tools-5.0.6/src/deptestomatic.cc new/libzypp-testsuite-tools-5.0.7/src/deptestomatic.cc --- old/libzypp-testsuite-tools-5.0.6/src/deptestomatic.cc 2025-01-20 12:33:51.000000000 +0100 +++ new/libzypp-testsuite-tools-5.0.7/src/deptestomatic.cc 2025-07-31 14:47:09.000000000 +0200 @@ -104,7 +104,20 @@ #define MARKER ">!> " #define RESULT cout << MARKER +//----------------------------------------------------------------------------- +struct DiffableLineFormater : public base::LogControl::LineFormater +{ + std::string format( const std::string & group_r, base::logger::LogLevel level_r, const char * file_r, const char * func_r, int line_r, const std::string & message_r ) override + { + return str::form( "<%d> [%s] %s(%s):%d %s", + level_r, + group_r.c_str(), + file_r, func_r, line_r, + message_r.c_str() ); + } +}; +//----------------------------------------------------------------------------- RepoManager makeRepoManager( const Pathname & mgrdir_r ) { RepoManagerOptions mgropt; @@ -308,12 +321,11 @@ cout << "- - - - - - - - - -" << endl; if (instorder) { - cout << endl; - RESULT << "Installation Order:" << endl << endl; + RESULT << "Installation Order:" << endl; sat::Transaction trans( sat::Transaction::loadFromPool ); trans.order(); - RESULT << dump(trans) << endl; + cout << dump(trans) << endl; cout << "- - - - - - - - - -" << endl; } @@ -650,7 +662,7 @@ bool verify = false; bool doUpdate = false; - bool instorder = false; + bool instorder = true; //false; bool printKeept = false; DBG << "execute_trial()" << endl; @@ -810,8 +822,9 @@ } else if ( node.name() == "update"|| node.name() == "verify" ) { // see libzypp@ca9bcf16, testcase writer mixed "update" and "verify" RESULT << "Doing update ..." << endl; + resolver->setUpdateMode( true ); // Add an update all packages job rather than doing a 2nd solverrun resolver->resolvePool(); - resolver->doUpdate(); + // resolver->doUpdate(); // A 2nd solverrun would be wrong here. It resets auto-results from resolvePool print_solution (pool, instorder, printKeept ); doUpdate = true; } else if ( node.name() == "instorder" || node.name() == "mediaorder" /*legacy*/ ) { @@ -980,8 +993,12 @@ if (package_name.empty()) package_name = node.getProp ("package"); string kind_name = node.getProp ("kind"); - string version = node.getProp ("ver"); - string release = node.getProp ("rel"); + string version = node.getProp ("version"); + if ( version.empty() ) + version = node.getProp ("ver"); + string release = node.getProp ("release"); + if ( release.empty() ) + release = node.getProp ("rel"); string architecture = node.getProp ("arch"); if ( version.empty() ) @@ -993,6 +1010,7 @@ { item->setStatus( item->hasInstalledObj() ? ui::S_Protected : ui::S_Taboo ); item->setStatus( ui::S_Taboo ); + RESULT << "Locking " << package_name << " " << item << endl; } else { @@ -1004,8 +1022,8 @@ PoolItem poolItem; poolItem = get_poolItem (source_alias, package_name, kind_name, version, release, architecture ); if (poolItem) { - RESULT << "Locking " << package_name << " from channel " << source_alias << poolItem << endl; poolItem.status().setLock (true, ResStatus::USER); + //RESULT << "Locking " << package_name << " from channel " << source_alias << " " << poolItem << endl; } else { cerr << "Unknown package " << source_alias << "::" << package_name << endl; } @@ -1227,17 +1245,40 @@ //--------------------------------------------------------------------------------------------------------------------- // libsolv: order.c +#define TYPE_BROKEN (1<<0) +#define TYPE_CON (1<<1) + +/* uninstall edges */ +#define TYPE_REQ_UI (1<<4) +#define TYPE_PREREQ_UI (1<<5) +#define TYPE_REQ_UU (1<<6) +#define TYPE_PREREQ_UU (1<<7) + +/* install edges */ +#define TYPE_SUG (1<<8) +#define TYPE_REC (1<<9) +#define TYPE_REQ (1<<10) +#define TYPE_PREREQ (1<<11) + +#define TYPE_CYCLETAIL (1<<16) +#define TYPE_CYCLEHEAD (1<<17) + + enum class CycleOrderBits { - BROKEN = (1<<0), - CON = (1<<1), - REQ_P = (1<<2), - PREREQ_P = (1<<3), - SUG = (1<<4), - REC = (1<<5), - REQ = (1<<6), - PREREQ = (1<<7), - CYCLETAIL = (1<<16), - CYCLEHEAD = (1<<17), +#define OUTS(V) V = TYPE_##V + OUTS(BROKEN ), + OUTS(CON ), + OUTS(REQ_UI ), + OUTS(PREREQ_UI), + OUTS(REQ_UU ), + OUTS(PREREQ_UU), + OUTS(SUG ), + OUTS(REC ), + OUTS(REQ ), + OUTS(PREREQ ), + OUTS(CYCLETAIL), + OUTS(CYCLEHEAD), +#undef OUTS }; ZYPP_DECLARE_FLAGS( CycleOrder, CycleOrderBits ); ZYPP_DECLARE_OPERATORS_FOR_FLAGS( CycleOrder ); @@ -1246,21 +1287,22 @@ { #define OUTS(V) { CycleOrderBits::V, #V } return str << stringify( obj, { - OUTS( BROKEN ), - OUTS( CON ), - OUTS( REQ_P ), - OUTS( PREREQ_P ), - OUTS( SUG ), - OUTS( REC ), - OUTS( REQ ), - OUTS( PREREQ ), - OUTS( CYCLETAIL ), - OUTS( CYCLEHEAD ), + OUTS(BROKEN ), + OUTS(CON ), + OUTS(REQ_UI ), + OUTS(PREREQ_UI), + OUTS(REQ_UU ), + OUTS(PREREQ_UU), + OUTS(SUG ), + OUTS(REC ), + OUTS(REQ ), + OUTS(PREREQ ), + OUTS(CYCLETAIL), + OUTS(CYCLEHEAD), } ); #undef OUTS } - inline bool addhexc2num( CycleOrder::Integral & num_r, char ch_r ) { if ( '0' <= ch_r && ch_r <= '9' ) @@ -1291,6 +1333,8 @@ { std::vector<std::string_view> words; strv::split( cycle_r , [&words]( std::string_view word ) { words.push_back( word ); } ); + if ( words.size() && words[0] == "CRITICAL" ) + words.erase( words.begin() ); if ( words.size() <= 2 || words[0] != "cycle:" || words[1] != "-->" ) { cerr << "Parse cycle OOPS: " << words << endl; @@ -1305,7 +1349,7 @@ return 2; } - str::Format fmt { "%-40s %-10s %s" }; + str::Format fmt { "%-50s %-10s %s" }; auto writeln = [&fmt]( std::string_view nam, std::string_view req ) { cout << fmt % nam % req % cycleOrder( req.substr(2) ) << endl; }; @@ -1336,7 +1380,12 @@ { zypp::base::LogControl::instance().logfile( "-" ); } - else if ( strncmp( *argv, "cycle:", 6 ) == 0 ) + else if ( *argv == string("-vv") ) + { + zypp::base::LogControl::instance().setLineFormater( zypp::shared_ptr<DiffableLineFormater>( new DiffableLineFormater ) ); + zypp::base::LogControl::instance().logfile( "-" ); + } + else if ( strncmp( *argv, "cycle:", 6 ) == 0 || strncmp( *argv, "CRITICAL", 8 ) == 0 ) { return cycleinfo( *argv ); }
