Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2021-09-21 21:12:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp" Tue Sep 21 21:12:28 2021 rev:449 rq:919702 version:17.28.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2021-09-07 21:13:48.116750394 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new.1899/libzypp.changes 2021-09-21 21:13:14.314645143 +0200 @@ -1,0 +2,13 @@ +Fri Sep 17 10:41:56 CEST 2021 - m...@suse.de + +- Make sure to keep states alives while transitioning + (bsc#1190199) +- May set techpreview variables for testing in /etc/zypp/zypp.conf. + If environment variables are unhandy one may enable the desired + techpreview in zypp.conf as well: + [main] + techpreview.ZYPP_SINGLE_RPMTRANS=1 + techpreview.ZYPP_MEDIANETWORK=1 +- version 17.28.4 (22) + +------------------------------------------------------------------- Old: ---- libzypp-17.28.3.tar.bz2 New: ---- libzypp-17.28.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.NIdxmn/_old 2021-09-21 21:13:14.874645777 +0200 +++ /var/tmp/diff_new_pack.NIdxmn/_new 2021-09-21 21:13:14.878645781 +0200 @@ -43,7 +43,7 @@ %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper Name: libzypp -Version: 17.28.3 +Version: 17.28.4 Release: 0 License: GPL-2.0-or-later URL: https://github.com/openSUSE/libzypp ++++++ libzypp-17.28.3.tar.bz2 -> libzypp-17.28.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.28.3/CMakeLists.txt new/libzypp-17.28.4/CMakeLists.txt --- old/libzypp-17.28.3/CMakeLists.txt 2021-09-03 14:31:22.000000000 +0200 +++ new/libzypp-17.28.4/CMakeLists.txt 2021-09-09 11:48:44.000000000 +0200 @@ -87,8 +87,8 @@ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden -Woverloaded-virtual -Wnon-virtual-dtor" ) -set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -DZYPP_NDEBUG" ) -set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -DZYPP_NDEBUG" ) +set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -DZYPP_NDEBUG -DNDEBUG" ) +set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -DZYPP_NDEBUG -DNDEBUG" ) IF(${CC_FORMAT_SECURITY}) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=format-security") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.28.3/VERSION.cmake new/libzypp-17.28.4/VERSION.cmake --- old/libzypp-17.28.3/VERSION.cmake 2021-09-03 14:43:43.000000000 +0200 +++ new/libzypp-17.28.4/VERSION.cmake 2021-09-17 10:51:24.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "22") SET(LIBZYPP_MINOR "28") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "4") # -# LAST RELEASED: 17.28.3 (22) +# LAST RELEASED: 17.28.4 (22) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.28.3/package/libzypp.changes new/libzypp-17.28.4/package/libzypp.changes --- old/libzypp-17.28.3/package/libzypp.changes 2021-09-03 14:43:43.000000000 +0200 +++ new/libzypp-17.28.4/package/libzypp.changes 2021-09-17 10:51:24.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Sep 17 10:41:56 CEST 2021 - m...@suse.de + +- Make sure to keep states alives while transitioning + (bsc#1190199) +- May set techpreview variables for testing in /etc/zypp/zypp.conf. + If environment variables are unhandy one may enable the desired + techpreview in zypp.conf as well: + [main] + techpreview.ZYPP_SINGLE_RPMTRANS=1 + techpreview.ZYPP_MEDIANETWORK=1 +- version 17.28.4 (22) + +------------------------------------------------------------------- Fri Sep 3 14:34:19 CEST 2021 - m...@suse.de - CMake/spec: Add option to force SINGLE_RPMTRANS as default for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.28.3/po/id.po new/libzypp-17.28.4/po/id.po --- old/libzypp-17.28.3/po/id.po 2021-08-26 18:56:17.000000000 +0200 +++ new/libzypp-17.28.4/po/id.po 2021-09-04 18:16:21.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-26 11:04+0200\n" -"PO-Revision-Date: 2021-06-17 15:58+0000\n" +"PO-Revision-Date: 2021-09-04 16:11+0000\n" "Last-Translator: Kukuh Syafaat <syafaatku...@gmail.com>\n" "Language-Team: Indonesian <https://l10n.opensuse.org/projects/libzypp/master/"; "id/>\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.6.2\n" +"X-Generator: Weblate 4.7.1\n" #: zypp/CountryCode.cc:50 msgid "Unknown country: " @@ -5088,6 +5088,8 @@ "install %1% from vendor %2%\n" " replacing %3% from vendor %4%" msgstr "" +"pasang %1% dari vendor %2%\n" +" menggantikan %3% dari vendor %4%" #: zypp/solver/detail/SATResolver.cc:1507 #, boost-format @@ -5147,7 +5149,7 @@ #: zypp/target/TargetImpl.cc:2619 msgid "Executing the transaction failed because of the following problems:" -msgstr "" +msgstr "Mengeksekusi transaksi gagal karena masalah berikut:" #. TranslatorExplanation after semicolon is error message #. TranslatorExplanation the colon is followed by an error message @@ -5420,11 +5422,11 @@ #: zypp-core/zyppng/io/forkspawnengine.cc:111 #: zypp-core/zyppng/io/forkspawnengine.cc:359 msgid "Invalid spawn arguments given." -msgstr "" +msgstr "Argumen spawn yang diberikan tidak valid." #: zypp-core/zyppng/io/forkspawnengine.cc:174 msgid "Unable to create control pipe." -msgstr "" +msgstr "Tidak dapat membuat pipa kontrol." #: zypp-core/zyppng/io/forkspawnengine.cc:240 #, c-format, boost-format @@ -5456,22 +5458,22 @@ #: zypp-core/zyppng/io/forkspawnengine.cc:306 #, c-format, boost-format msgid "Can't exec '%s', chdir failed (%s)." -msgstr "" +msgstr "Tak bisa eksekusi '%s', chdir gagal (%s)." #: zypp-core/zyppng/io/forkspawnengine.cc:309 #, c-format, boost-format msgid "Can't exec '%s', chroot failed (%s)." -msgstr "" +msgstr "Tak bisa eksekusi '%s', chroot gagal (%s)." #: zypp-core/zyppng/io/forkspawnengine.cc:312 #, c-format, boost-format msgid "Can't exec '%s', exec failed (%s)." -msgstr "" +msgstr "Tak bisa eksekusi '%s', eksekusi gagal (%s)." #: zypp-core/zyppng/io/forkspawnengine.cc:316 #, c-format, boost-format msgid "Can't exec '%s', unexpected error." -msgstr "" +msgstr "Tak bisa eksekusi '%s', kesalahan tak terduga." #~ msgid "%s does not belong to a distupgrade repository" #~ msgstr "%s bukan milik repositori distupgrade" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.28.3/zypp/ZConfig.cc new/libzypp-17.28.4/zypp/ZConfig.cc --- old/libzypp-17.28.3/zypp/ZConfig.cc 2021-08-26 18:56:18.000000000 +0200 +++ new/libzypp-17.28.4/zypp/ZConfig.cc 2021-09-06 17:26:24.000000000 +0200 @@ -602,6 +602,16 @@ { credentials_global_file_path = Pathname(value); } + else if ( entry == "techpreview.ZYPP_SINGLE_RPMTRANS" ) + { + DBG << "techpreview.ZYPP_SINGLE_RPMTRANS=" << value << endl; + ::setenv( "ZYPP_SINGLE_RPMTRANS", value.c_str(), 1 ); + } + else if ( entry == "techpreview.ZYPP_MEDIANETWORK" ) + { + DBG << "techpreview.ZYPP_MEDIANETWORK=" << value << endl; + ::setenv( "ZYPP_MEDIANETWORK", value.c_str(), 1 ); + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.28.3/zypp-core/zyppng/base/statemachine.h new/libzypp-17.28.4/zypp-core/zyppng/base/statemachine.h --- old/libzypp-17.28.3/zypp-core/zyppng/base/statemachine.h 2021-08-26 18:56:18.000000000 +0200 +++ new/libzypp-17.28.4/zypp-core/zyppng/base/statemachine.h 2021-09-09 11:48:44.000000000 +0200 @@ -56,11 +56,15 @@ static constexpr bool isFinal = State::isFinal; void enter( ) { - return _ptr->enter( ); + // keep the pointer around, for we might transition to the next state immediately + auto keepAlive = _ptr; + return keepAlive->enter( ); } void exit( ) { - return _ptr->exit( ); + // keep the pointer around, for we might transition to the next state immediately + auto keepAlive = _ptr; + return keepAlive->exit( ); } std::shared_ptr<State> wrappedState () { @@ -381,6 +385,7 @@ if ( _state.index() == 0 || _isInFinalState ) { _previousState.reset(); _isInFinalState = false; + _emittedFinalSig = false; enterState( FState( static_cast<Derived &>(*this) ) ); } } @@ -500,6 +505,7 @@ // handle final state things if constexpr ( NewState::isFinal ) { _isInFinalState = true; + _emittedFinalSig = false; } // let the outside world know whats going on @@ -508,8 +514,12 @@ // call enter on the state as the last thing to do, it might emit a transition event right away std::get< std::decay_t<NewState> >( _state ).enter(); - if ( _isInFinalState ) + // emit the final signal, but only if it was not already emitted by a subsequent transition + if ( _isInFinalState && !_emittedFinalSig ) { + _emittedFinalSig = true; _sigFinished.emit(); + } + } template <typename State, typename Transition> @@ -544,6 +554,7 @@ private: bool _isInFinalState = false; + bool _emittedFinalSig = false; //< Flag to make sure the finished signals is only emitted once Signal <void ( StateId )> _sigStateChanged; Signal <void ()> _sigFinished; StateSet _state = _InitialState();
