Imported Upstream version 17.25.10

diff --git a/VERSION.cmake b/VERSION.cmake
index 0e8b431..dc078d6 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "22")
 SET(LIBZYPP_MINOR "25")
-SET(LIBZYPP_PATCH "9")
+SET(LIBZYPP_PATCH "10")
 #
-# LAST RELEASED: 17.25.9 (22)
+# LAST RELEASED: 17.25.10 (22)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 9b2eaf9..214795a 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Wed Apr 28 15:34:01 CEST 2021 - ma@suse.de
+
+- Properly handle permission denied when providing optional files
+  (bsc#1185239)
+- Fix sevice detection with cgroupv2 (bsc#1184997)
+- version 17.25.10 (22)
+
+-------------------------------------------------------------------
 Thu Apr 22 15:52:19 CEST 2021 - ma@suse.de
 
 - Add missing includes for GCC 11 (bsc#1181874)

diff --git a/zypp/MediaSetAccess.cc b/zypp/MediaSetAccess.cc
index ceb4f6a..138e2ea 100644 (file)
--- a/zypp/MediaSetAccess.cc
+++ b/zypp/MediaSetAccess.cc
@@ -184,6 +184,8 @@ IMPL_PTR_TYPE(MediaSetAccess);
     }
     catch ( const media::MediaFileNotFoundException & excpt_r )
     { ZYPP_CAUGHT( excpt_r ); }
+    catch ( const media::MediaForbiddenException & excpt_r )
+    { ZYPP_CAUGHT( excpt_r ); }
     catch ( const media::MediaNotAFileException & excpt_r )
     { ZYPP_CAUGHT( excpt_r ); }
    return Pathname();

diff --git a/zypp/misc/CheckAccessDeleted.cc b/zypp/misc/CheckAccessDeleted.cc
index 6b0f4c8..feeba20 100644 (file)
--- a/zypp/misc/CheckAccessDeleted.cc
+++ b/zypp/misc/CheckAccessDeleted.cc
@@ -532,7 +532,7 @@ namespace zypp
 
   std::string CheckAccessDeleted::ProcInfo::service() const
   {
-    static const str::regex rx( "[0-9]+:name=systemd:/system.slice/(.*/)?(.*).service$" );
+    static const str::regex rx( "(0::|[0-9]+:name=systemd:)/system.slice/(.*/)?(.*).service$" );
     str::smatch what;
     std::string ret;
     iostr::simpleParseFile( InputStream( Pathname("/proc")/pid/"cgroup" ),
@@ -540,7 +540,7 @@ namespace zypp
                            {
                              if ( str::regex_match( line_r, what, rx ) )
                              {
-                               ret = what[2];
+                               ret = what[3];
                                return false;   // stop after match
                              }
                              return true;