Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2016-09-23 11:23:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2016-09-12 13:22:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2016-09-23 11:23:13.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 15 15:27:15 CEST 2016 - ma@suse.de
+
+- RepoFileReader: fix parsing of multiline url entries (bsc#964932)
+- Allow repo type 'rpm' as alias for 'rpm-md' (fixes openSUSE/zypper#100)
+- version 16.2.4 (0)
+
+-------------------------------------------------------------------
@@ -5,0 +13,2 @@
+- Fixes broken XML output introduced by an unwanted change in 16.2.2
+ (bsc#998344)
Old:
----
libzypp-16.2.3.tar.bz2
New:
----
libzypp-16.2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.s2FuSc/_old 2016-09-23 11:23:14.000000000 +0200
+++ /var/tmp/diff_new_pack.s2FuSc/_new 2016-09-23 11:23:14.000000000 +0200
@@ -19,7 +19,7 @@
%define force_gcc_46 0
Name: libzypp
-Version: 16.2.3
+Version: 16.2.4
Release: 0
Url: git://gitorious.org/opensuse/libzypp.git
Summary: Package, Patch, Pattern, and Product Management
++++++ libzypp-16.2.3.tar.bz2 -> libzypp-16.2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/VERSION.cmake new/libzypp-16.2.4/VERSION.cmake
--- old/libzypp-16.2.3/VERSION.cmake 2016-09-09 17:33:01.000000000 +0200
+++ new/libzypp-16.2.4/VERSION.cmake 2016-09-15 15:29:07.000000000 +0200
@@ -61,8 +61,8 @@
SET(LIBZYPP_MAJOR "16")
SET(LIBZYPP_COMPATMINOR "0")
SET(LIBZYPP_MINOR "2")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "4")
#
-# LAST RELEASED: 16.2.3 (0)
+# LAST RELEASED: 16.2.4 (0)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/package/libzypp.changes new/libzypp-16.2.4/package/libzypp.changes
--- old/libzypp-16.2.3/package/libzypp.changes 2016-09-09 17:33:01.000000000 +0200
+++ new/libzypp-16.2.4/package/libzypp.changes 2016-09-15 15:29:07.000000000 +0200
@@ -1,8 +1,17 @@
-------------------------------------------------------------------
+Thu Sep 15 15:27:15 CEST 2016 - ma@suse.de
+
+- RepoFileReader: fix parsing of multiline url entries (bsc#964932)
+- Allow repo type 'rpm' as alias for 'rpm-md' (fixes openSUSE/zypper#100)
+- version 16.2.4 (0)
+
+-------------------------------------------------------------------
Fri Sep 9 16:43:30 CEST 2016 - ma@suse.de
- xmlout::Node: Allow adding nore attributes while the start node
is not closed (FATE#320699)
+- Fixes broken XML output introduced by an unwanted change in 16.2.2
+ (bsc#998344)
- version 16.2.3 (0)
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/po/da.po new/libzypp-16.2.4/po/da.po
--- old/libzypp-16.2.3/po/da.po 2016-05-13 19:21:04.000000000 +0200
+++ new/libzypp-16.2.4/po/da.po 2016-09-17 21:21:06.000000000 +0200
@@ -7,15 +7,16 @@
"Project-Id-Version: libzypp\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-03 15:55+0200\n"
-"PO-Revision-Date: 2015-10-06 21:23+0200\n"
-"Last-Translator: Martin Schlander \n"
-"Language-Team: Danish \n"
+"PO-Revision-Date: 2016-09-17 19:18+0000\n"
+"Last-Translator: Martin Schlander \n"
+"Language-Team: Danish https://l10n.opensuse.org/projects/libzypp/master/da/"
+"\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.6\n"
#: zypp/target/hal/HalException.h:46 zypp/target/hal/HalException.h:55
#: zypp/target/hal/HalException.h:64
@@ -250,32 +251,32 @@
#. translators: possible rpm package signature check result [brief]
#: zypp/target/rpm/RpmDb.cc:2365
msgid "Signature is OK"
-msgstr ""
+msgstr "Signatur er o.k."
#. translators: possible rpm package signature check result [brief]
#: zypp/target/rpm/RpmDb.cc:2367
msgid "Unknown type of signature"
-msgstr ""
+msgstr "Ukendt signaturtype"
#. translators: possible rpm package signature check result [brief]
#: zypp/target/rpm/RpmDb.cc:2369
msgid "Signature does not verify"
-msgstr ""
+msgstr "Signaturen verificerer ikke"
#. translators: possible rpm package signature check result [brief]
#: zypp/target/rpm/RpmDb.cc:2371
msgid "Signature is OK, but key is not trusted"
-msgstr ""
+msgstr "Signaturen er o.k., men nøglen er ikke betroet"
#. translators: possible rpm package signature check result [brief]
#: zypp/target/rpm/RpmDb.cc:2373
msgid "Signatures public key is not available"
-msgstr ""
+msgstr "Signaturens offentlige nøgle er ikke tilgængelig"
#. translators: possible rpm package signature check result [brief]
#: zypp/target/rpm/RpmDb.cc:2375
msgid "File does not exist or signature can't be checked"
-msgstr ""
+msgstr "Filen findes ikke eller signaturen kan ikke tjekkes"
#: zypp/ProblemSolution.cc:114
msgid "Following actions will be done:"
@@ -284,7 +285,7 @@
#: zypp/RepoManager.cc:297
#, boost-format
msgid "Cannot read repo directory '%1%': Permission denied"
-msgstr ""
+msgstr "Kan ikke læse softwarekildemappen \"%1%\": Adgang nægtet"
#. TranslatorExplanation '%s' is a pathname
#: zypp/RepoManager.cc:305 zypp/RepoManager.cc:767 zypp/RepoManager.cc:1523
@@ -296,7 +297,7 @@
#: zypp/RepoManager.cc:315
#, boost-format
msgid "Cannot read repo file '%1%': Permission denied"
-msgstr ""
+msgstr "Kan ikke læse softwarekildefilen \"%1%\": Adgang nægtet"
#: zypp/RepoManager.cc:338
msgid "Repository alias cannot start with dot."
@@ -326,8 +327,8 @@
#: zypp/RepoManager.cc:1082
msgid "Valid metadata not found at specified URL"
msgid_plural "Valid metadata not found at specified URLs"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Der blev ikke fundet gyldige metadata på den angivne URL"
+msgstr[1] "Der blev ikke fundet gyldige metadata på de angivne URL'er"
#: zypp/RepoManager.cc:1132 zypp/RepoManager.cc:1240 zypp/RepoManager.cc:1296
#, c-format, boost-format
@@ -553,11 +554,11 @@
#. translators: an annotation to a gpg keys expiry date
#: zypp/PublicKey.cc:133
-#, fuzzy, c-format, boost-format
+#, boost-format, c-format
msgid "(expires in %d day)"
msgid_plural "(expires in %d days)"
-msgstr[0] "(udløber indenfor 24 t.)"
-msgstr[1] "(udløber indenfor 24 t.)"
+msgstr[0] "(udløber om %d dag)"
+msgstr[1] "(udløber om %d dage)"
#: zypp/VendorSupportOptions.cc:14
msgid "unknown"
@@ -4261,7 +4262,7 @@
#: zypp/repo/PackageProvider.cc:216
msgid "Signature verification failed"
-msgstr ""
+msgstr "Verificering af signatur mislykkedes"
#. TranslatorExplanation %s = name of the package being processed.
#: zypp/repo/PackageProvider.cc:386
@@ -4393,7 +4394,7 @@
#: zypp/solver/detail/SATResolver.cc:1141
#, c-format, boost-format
msgid "remove lock to allow removal of %s"
-msgstr ""
+msgstr "Fjern lås for at tillade fjernelse af %s"
#: zypp/solver/detail/SATResolver.cc:1146
#: zypp/solver/detail/SATResolver.cc:1182
@@ -4410,7 +4411,7 @@
#: zypp/solver/detail/SATResolver.cc:1166
#, c-format, boost-format
msgid "remove lock to allow installation of %s"
-msgstr ""
+msgstr "fjern lås for at tillade installation af %s"
#: zypp/solver/detail/SATResolver.cc:1217
#: zypp/solver/detail/SATResolver.cc:1238
@@ -4494,7 +4495,7 @@
#: zypp/solver/detail/ProblemSolutionIgnore.cc:48
msgid "generally ignore of some dependencies"
-msgstr ""
+msgstr "ignorér generelt nogle afhængigheder"
#: zypp/parser/RepoindexFileReader.cc:197
#, c-format, boost-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/tests/parser/RepoFileReader_test.cc new/libzypp-16.2.4/tests/parser/RepoFileReader_test.cc
--- old/libzypp-16.2.3/tests/parser/RepoFileReader_test.cc 2016-02-11 17:22:14.000000000 +0100
+++ new/libzypp-16.2.4/tests/parser/RepoFileReader_test.cc 2016-09-15 15:29:07.000000000 +0200
@@ -14,6 +14,9 @@
"enabled=1\n"
"autorefresh=0\n"
"baseurl=http://download.opensuse.org/factory-tested/repo/oss/\n"
+"baseurl=http://download.opensuse.org/factory-tested/repo/oss/2\n"
+"plugin:spacewalk?channel=sle-manager-tools12-pool-x86_64-sp1&server=0\n"
+"http://download.opensuse.org/factory-tested/repo/=oss/4\n"
"type=yast2\n"
"keeppackages=0\n";
@@ -46,6 +49,10 @@
RepoCollector collector;
parser::RepoFileReader parser( input, bind( &RepoCollector::collect, &collector, _1 ) );
BOOST_CHECK_EQUAL(1, collector.repos.size());
+
+ const RepoInfo & repo( collector.repos.front() );
+ BOOST_CHECK_EQUAL( 4, repo.baseUrlsSize() );
+ cout << repo << endl;
}
// fedora
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/zypp/Capability.cc new/libzypp-16.2.4/zypp/Capability.cc
--- old/libzypp-16.2.3/zypp/Capability.cc 2016-02-11 17:22:14.000000000 +0100
+++ new/libzypp-16.2.4/zypp/Capability.cc 2016-09-16 12:57:06.000000000 +0200
@@ -381,7 +381,9 @@
// str_r might be the form "libzypp-1.2.3-4.5(.arch)'
// correctly parsed as name capability by the ctor.
- if ( detail.isNamed() && ::strrchr( detail.name().c_str(), '-' ) && sat::WhatProvides( cap ).empty() )
+ // TODO: Think about allowing glob char in name - for now don't process
+ if ( detail.isNamed() && !::strpbrk( detail.name().c_str(), "*?[{" )
+ && ::strrchr( detail.name().c_str(), '-' ) && sat::WhatProvides( cap ).empty() )
{
Arch origArch( detail.arch() ); // to support a trailing .arch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/zypp/parser/IniParser.cc new/libzypp-16.2.4/zypp/parser/IniParser.cc
--- old/libzypp-16.2.3/zypp/parser/IniParser.cc 2016-02-11 17:22:14.000000000 +0100
+++ new/libzypp-16.2.4/zypp/parser/IniParser.cc 2016-09-15 15:29:07.000000000 +0200
@@ -33,7 +33,7 @@
namespace {
inline const std::string & keyGarbage()
{
- static const std::string & _val( ",|/\\" );
+ static const std::string & _val( ":/?|,\\" );
return _val;
}
} //namespace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/zypp/repo/RepoType.cc new/libzypp-16.2.4/zypp/repo/RepoType.cc
--- old/libzypp-16.2.3/zypp/repo/RepoType.cc 2016-02-11 17:22:14.000000000 +0100
+++ new/libzypp-16.2.4/zypp/repo/RepoType.cc 2016-09-12 14:05:05.000000000 +0200
@@ -24,7 +24,7 @@
static NamedValueRepoType::Type & _t( *new NamedValueRepoType::Type );
if ( _t.empty() )
{
- _t( RepoType::RPMMD_e ) | "rpm-md" | "rpmmd"|"repomd"|"yum"|"up2date";
+ _t( RepoType::RPMMD_e ) | "rpm-md" | "rpm"|"rpmmd"|"repomd"|"yum"|"up2date";
_t( RepoType::YAST2_e ) | "yast2" | "yast"|"susetags";
_t( RepoType::RPMPLAINDIR_e ) | "plaindir";
_t( RepoType::NONE_e ) | "NONE" | "none";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.2.3/zypp/sat/detail/PoolImpl.cc new/libzypp-16.2.4/zypp/sat/detail/PoolImpl.cc
--- old/libzypp-16.2.3/zypp/sat/detail/PoolImpl.cc 2016-07-05 11:41:05.000000000 +0200
+++ new/libzypp-16.2.4/zypp/sat/detail/PoolImpl.cc 2016-09-16 10:53:07.000000000 +0200
@@ -107,6 +107,12 @@
static void logSat( CPool *, void *data, int type, const char *logString )
{
+ // "1234567890123456789012345678901234567890
+ if ( 0 == strncmp( logString, " - no rule created", 19 ) )
+ return;
+ if ( 0 == strncmp( logString, " next rules: 0 0", 19 ) )
+ return;
+
if ( type & (SOLV_FATAL|SOLV_ERROR) ) {
L_ERR("libsolv") << logString;
} else if ( type & SOLV_DEBUG_STATS ) {