From 04243be81738d4003857a499ff88373b36c2acb4 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 11:15:06 +0900 Subject: [PATCH] Imported Upstream version 16.2.1 Change-Id: Ia95af58b65efe4bbfd4d4ff3a6eeaf75b2277349 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- libzypp.spec.cmake | 2 +- package/libzypp.changes | 7 +++++++ po/pt_BR.po | 17 +++++++++-------- zypp/RepoManager.cc | 16 ++++++---------- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index d557d52..376306b 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "16") SET(LIBZYPP_COMPATMINOR "0") SET(LIBZYPP_MINOR "2") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 16.2.0 (0) +# LAST RELEASED: 16.2.1 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 84d7c90..ebd430d 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -75,7 +75,7 @@ BuildRequires: pkgconfig BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.6.19 +BuildRequires: libsolv-devel >= 0.6.23 %if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools diff --git a/package/libzypp.changes b/package/libzypp.changes index 0b857ab..2087c87 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 21 13:09:33 CEST 2016 - ma@suse.de + +- Rebuild .solv-files not matching the parsers LIBSOLV_TOOLVERSION +- BuildRequires: libsolv-devel >= 0.6.23 +- version 16.2.1 (0) + +------------------------------------------------------------------- Mon Jul 18 16:36:25 CEST 2016 - ma@suse.de - Product: Offer tri-state hasEndOfLife details (FATE#320699) diff --git a/po/pt_BR.po b/po/pt_BR.po index 51daba6..1d16b2b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-03 15:55+0200\n" -"PO-Revision-Date: 2016-07-13 23:30+0000\n" +"PO-Revision-Date: 2016-07-19 16:17+0000\n" "Last-Translator: Marcos Teofilo \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -52,7 +52,7 @@ msgstr "Referência a objeto URL vazio inválida" #: zypp/Url.cc:326 zypp/Url.cc:340 msgid "Unable to parse Url components" -msgstr "Não foi possível analisar os componentes do URL" +msgstr "Não foi possível analisar os componentes da URL" #: zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -114,7 +114,7 @@ msgstr "Complementa" #: zypp/CheckSum.cc:136 #, c-format, boost-format msgid "Dubious type '%s' for %u byte checksum '%s'" -msgstr "Tipo '%s' duvidoso da checksum '%s' de %u byte(s)" +msgstr "Tipo '%s' duvidoso da soma de verificação '%s' de %u byte(s)" #: zypp/target/TargetImpl.cc:310 msgid " executed" @@ -134,7 +134,7 @@ msgstr "%s já executado como %s)" #: zypp/target/TargetImpl.cc:459 msgid " execution skipped while aborting" -msgstr " execução ignorada durante a interrupção" +msgstr " execução ignorada durante o cancelamento" #: zypp/target/TargetImpl.cc:514 zypp/target/TargetImpl.cc:534 #: zypp/target/TargetImpl.cc:562 zypp/target/TargetImpl.cc:599 @@ -154,7 +154,8 @@ msgstr "A instalação foi cancelada conforme instruções." #: zypp/target/hal/HalContext.cc:24 msgid "Sorry, but this version of libzypp was built without HAL support." -msgstr "Esta versão do libzypp foi criada sem o suporte ao HAL." +msgstr "" +"Desculpe, mas esta versão do libzypp foi compilada sem o suporte ao HAL." #: zypp/target/hal/HalContext.cc:117 msgid "HalContext not connected" @@ -220,7 +221,7 @@ msgstr "Arquivos de configuração alterados para %s:" #: zypp/target/rpm/RpmDb.cc:2024 #, c-format, boost-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" -msgstr "o rpm salvou %s como %s, mas não foi possível determinar a diferença" +msgstr "o RPM salvou %s como %s, mas não foi possível determinar a diferença" #. %s = filenames #: zypp/target/rpm/RpmDb.cc:2026 @@ -282,12 +283,12 @@ msgstr "A assinatura está OK, mas a chave não é confiável" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2373 msgid "Signatures public key is not available" -msgstr "A chave de assinatura pública não está disponível" +msgstr "Chave pública das assinaturas não disponível" #. 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 "O arquivo não existe ou a assinatura não pôde ser verificada" +msgstr "O arquivo não existe ou a assinatura não pode ser verificada" #: zypp/ProblemSolution.cc:114 msgid "Following actions will be done:" diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc index 8c455c9..ac9c2aa 100644 --- a/zypp/RepoManager.cc +++ b/zypp/RepoManager.cc @@ -18,6 +18,8 @@ #include #include +#include + #include "zypp/base/InputStream.h" #include "zypp/base/LogTools.h" #include "zypp/base/Gettext.h" @@ -1574,19 +1576,13 @@ namespace zypp { Repository repo = sat::Pool::instance().addRepoSolv( solvfile, info ); // test toolversion in order to rebuild solv file in case - // it was written by an old libsolv-tool parser. - // - // Known version strings used: - // - - // - "1.0" - // - sat::LookupRepoAttr toolversion( sat::SolvAttr::repositoryToolVersion, repo ); - if ( toolversion.begin().asString().empty() ) + // it was written by a different libsolv-tool parser. + const std::string & toolversion( sat::LookupRepoAttr( sat::SolvAttr::repositoryToolVersion, repo ).begin().asString() ); + if ( toolversion != LIBSOLV_TOOLVERSION ) { repo.eraseFromPool(); - ZYPP_THROW(Exception("Solv-file was created by old parser.")); + ZYPP_THROW(Exception(str::Str() << "Solv-file was created by '"<