Imported Upstream version 17.25.5

diff --git a/VERSION.cmake b/VERSION.cmake
index 34a42fd..ef5f44d 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 "4")
+SET(LIBZYPP_PATCH "5")
 #
-# LAST RELEASED: 17.25.4 (22)
+# LAST RELEASED: 17.25.5 (22)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 80ed1b5..98d6e00 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,9 +1,15 @@
 -------------------------------------------------------------------
+Fri Dec 11 16:52:54 CET 2020 - ma@suse.de
+
+- Fix lsof monitoring (bsc#1179909)
+- version 17.25.5 (22)
+
+-------------------------------------------------------------------
 Thu Dec  3 17:06:35 CET 2020 - ma@suse.de
 
 - Prevent librpmDb iterator from accidentally creating an empty
   rpmdb in / (repoened bsc#1178910)
-- Fix update of gpg keys with elongated expire date (bsc#179222)
+- Fix update of gpg keys with elongated expire date (bsc#1179222)
 - needreboot: remove udev from the list (bsc#1179083)
 - Prefer /run over /var/run.
 - version 17.25.4 (22)

diff --git a/po/pt.po b/po/pt.po
index 6373e24..137100f 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,16 +13,16 @@ msgstr ""
 "Project-Id-Version: zypp.pt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-09-18 16:45+0200\n"
-"PO-Revision-Date: 2008-06-10 16:04+0100\n"
-"Last-Translator: Antonio Cardoso Martins <digiplan.pt@gmail.com>\n"
-"Language-Team: Portuguese <opensuse-pt@opensuse.org>\n"
+"PO-Revision-Date: 2020-12-06 18:26+0000\n"
+"Last-Translator: Luís Tiago Favas <al62006@utad.eu>\n"
+"Language-Team: Portuguese <https://l10n.opensuse.org/projects/libzypp/master/"
+"pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-">\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Weblate 3.6.1\n"
 
 #. dubious: Throw on malformed known types, otherwise log a warning.
 #: zypp/CheckSum.cc:136
@@ -32,7 +32,7 @@ msgstr "Tipo '%s' dúbio para soma de verificação de %u byte '%s'"
 
 #: zypp/CountryCode.cc:50
 msgid "Unknown country: "
-msgstr "Pais desconhecido:"
+msgstr "País desconhecido: "
 
 #. Defined CountryCode constants
 #. Defined LanguageCode constants
@@ -480,9 +480,8 @@ msgstr "Guiana Francesa"
 
 #. :GUF:254:
 #: zypp/CountryCode.cc:237
-#, fuzzy
 msgid "Guernsey"
-msgstr "Alemanha"
+msgstr "Guernsey"
 
 # name for GHA
 #: zypp/CountryCode.cc:238
@@ -608,7 +607,7 @@ msgstr "Israel"
 #. :ISR:376:
 #: zypp/CountryCode.cc:260
 msgid "Isle of Man"
-msgstr ""
+msgstr "Ilha de Man"
 
 #: zypp/CountryCode.cc:261
 msgid "India"
@@ -643,7 +642,7 @@ msgstr "Itália"
 #. :ITA:380:
 #: zypp/CountryCode.cc:267
 msgid "Jersey"
-msgstr ""
+msgstr "Jersey"
 
 # name for JAM
 #: zypp/CountryCode.cc:268
@@ -810,9 +809,8 @@ msgstr "Montenegro"
 
 # name for SMR
 #: zypp/CountryCode.cc:297
-#, fuzzy
 msgid "Saint Martin"
-msgstr "São Marino"
+msgstr "Coletividade de São Martinho"
 
 # name for MDG
 #: zypp/CountryCode.cc:298
@@ -1414,7 +1412,7 @@ msgstr "Providencia"
 
 #: zypp/Dep.cc:97
 msgid "Prerequires"
-msgstr ""
+msgstr "Pré requer"
 
 #: zypp/Dep.cc:98
 msgid "Requires"
@@ -1462,12 +1460,12 @@ msgstr "Não é possível fazer chroot para '%s' (%s)."
 #: zypp/ExternalProgram.cc:375
 #, c-format, boost-format
 msgid "Can't chdir to '%s' inside chroot '%s' (%s)."
-msgstr ""
+msgstr "Não foi possível fazer chdir a  '%s' dentro de chroot '%s' (%s)."
 
 #: zypp/ExternalProgram.cc:376
 #, c-format, boost-format
 msgid "Can't chdir to '%s' (%s)."
-msgstr ""
+msgstr "Não foi possível fazer chdir a '%s' (%s)."
 
 #. don't want to get here
 #: zypp/ExternalProgram.cc:405

diff --git a/tests/zypp/base/CMakeLists.txt b/tests/zypp/base/CMakeLists.txt
index d8d0d35..adac9eb 100644 (file)
--- a/tests/zypp/base/CMakeLists.txt
+++ b/tests/zypp/base/CMakeLists.txt
@@ -1,4 +1,4 @@
 ADD_TESTS(Glob )
 ADD_TESTS(Sysconfig )
 ADD_TESTS(String )
-ADD_TESTS(CleanerThread )
+ADD_TESTS(ExternalProgram )

diff --git a/tests/zypp/base/CleanerThread_test.cc b/tests/zypp/base/ExternalProgram_test.cc
similarity index 61%
rename from tests/zypp/base/CleanerThread_test.cc
rename to tests/zypp/base/ExternalProgram_test.cc
index 1c9b989..802564b 100644 (file)
--- a/tests/zypp/base/CleanerThread_test.cc
+++ b/tests/zypp/base/ExternalProgram_test.cc
@@ -6,7 +6,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#define BOOST_TEST_MODULE CleanerThread
+#define BOOST_TEST_MODULE ExternalProgram
 
 using zypp::ExternalProgram;
 
@@ -24,3 +24,12 @@ BOOST_AUTO_TEST_CASE( CleanerThread_default )
   BOOST_CHECK_EQUAL( res, -1 );
   BOOST_CHECK_EQUAL( errno, ECHILD );
 }
+
+BOOST_AUTO_TEST_CASE( ReadTimeout )
+{
+  static const char* argv[] = { "sleep", "2", NULL };
+  ExternalProgram prog( argv, ExternalProgram::Discard_Stderr );
+  BOOST_CHECK_THROW( prog.receiveLine( 100 ), io::TimeoutException );
+  BOOST_CHECK_EQUAL( prog.receiveLine( 3000 ), "" );
+  BOOST_CHECK_EQUAL( prog.close(), 0 );
+}

diff --git a/zypp/base/IOTools.cc b/zypp/base/IOTools.cc
index 9abce85..c5ef798 100644 (file)
--- a/zypp/base/IOTools.cc
+++ b/zypp/base/IOTools.cc
@@ -91,7 +91,7 @@ namespace zypp::io {
 
       clearerr( inputfile );
 
-      int retval = g_poll( &fd, 1, timeout );
+      int retval = g_poll( &fd, 1, remainingTimeout );
       if ( retval == -1 )
       {
         if ( errno != EINTR ) {
@@ -121,7 +121,7 @@ namespace zypp::io {
       // we timed out, or were interrupted for some reason
       // check if we can wait more
       if ( timer ) {
-        remainingTimeout -= g_timer_elapsed( timer, nullptr );
+        remainingTimeout -= g_timer_elapsed( timer, nullptr ) * 1000;
         if ( remainingTimeout <= 0 )
           return std::make_pair( ReceiveUpToResult::Timeout, line );
       }

diff --git a/zypp/misc/CheckAccessDeleted.cc b/zypp/misc/CheckAccessDeleted.cc
index cf1d443..6b0f4c8 100644 (file)
--- a/zypp/misc/CheckAccessDeleted.cc
+++ b/zypp/misc/CheckAccessDeleted.cc
@@ -443,7 +443,7 @@ namespace zypp
       cachemap = _pimpl->filterInput( prog );
     } catch ( const io::TimeoutException &e ) {
       ZYPP_CAUGHT( e );
-      prog.close();
+      prog.kill();
       ZYPP_THROW ( Exception( "Reading data from 'lsof' timed out.") );
     }