From ee089e699438d78d81a496418971d44c85c49f47 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 11:11:45 +0900 Subject: [PATCH] Imported Upstream version 16.0.3 Change-Id: I0b0fe2268ef3a00ca53aef4836108e1c6c6f9114 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- libzypp.spec.cmake | 2 +- mkChangelog | 2 +- package/libzypp.changes | 7 ++++++ po/sk.po | 52 ++++++++++++++++++++++----------------------- po/zh_CN.po | 17 ++++++++------- zypp/ResPool.h | 2 +- zypp/sat/Pool.h | 9 +++++++- zypp/sat/detail/PoolImpl.cc | 11 ++++++---- zypp/sat/detail/PoolImpl.h | 2 +- 10 files changed, 63 insertions(+), 45 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index a91f980..8a43be5 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "16") SET(LIBZYPP_COMPATMINOR "0") SET(LIBZYPP_MINOR "0") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") # -# LAST RELEASED: 16.0.2 (0) +# LAST RELEASED: 16.0.3 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 6dee375..84d7c90 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -48,7 +48,7 @@ Recommends: lsof BuildRequires: cmake BuildRequires: openssl-devel %if 0%{?suse_version} >= 1130 || 0%{?fedora_version} >= 16 -BuildRequires: libudev-devel +BuildRequires: pkgconfig(libudev) %else BuildRequires: hal-devel %endif diff --git a/mkChangelog b/mkChangelog index 27ad6c7..52cb498 100755 --- a/mkChangelog +++ b/mkChangelog @@ -107,7 +107,7 @@ function sameVersion() { } function getchanges() { - git log --no-merges --pretty=format:'- %s' "$LAST_RELEASE"..HEAD | grep -v 'po.tar.bz2' + git log --no-merges --pretty=format:'- %s' "$LAST_RELEASE"..HEAD | grep -v 'po.tar.bz2\|Translated using Weblate' } function newchangesentry() { diff --git a/package/libzypp.changes b/package/libzypp.changes index 49036bf..108bfcd 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 13 12:53:03 CEST 2016 - ma@suse.de + +- Shrink pool if all repos are removed (bnc#899755) +- Avoid direct BuildRequire on libudev-devel (#60) +- version 16.0.3 (0) + +------------------------------------------------------------------- Tue Jun 7 18:43:31 CEST 2016 - ma@suse.de - Allow PackageKit to drop the zypp lock (bnc#899755) diff --git a/po/sk.po b/po/sk.po index feb0c3c..5f96e1c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: libzypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-03 15:55+0200\n" -"PO-Revision-Date: 2016-05-29 10:45+0000\n" +"PO-Revision-Date: 2016-06-05 18:55+0000\n" "Last-Translator: Ferdinand Galko \n" -"Language-Team: Slovak " +"Language-Team: Slovak " "\n" "Language: sk\n" "MIME-Version: 1.0\n" @@ -3797,7 +3797,7 @@ msgstr "Inari Sami" #. language code: smo sm #: zypp/LanguageCode.cc:971 msgid "Samoan" -msgstr "Samoan" +msgstr "Samojčina" #. language code: sms #: zypp/LanguageCode.cc:973 @@ -3807,7 +3807,7 @@ msgstr "Skolt Sami" #. language code: sna sn #: zypp/LanguageCode.cc:975 msgid "Shona" -msgstr "Shona" +msgstr "Šona" #. language code: snd sd #: zypp/LanguageCode.cc:977 @@ -3822,7 +3822,7 @@ msgstr "Soninke" #. language code: sog #: zypp/LanguageCode.cc:981 msgid "Sogdian" -msgstr "Sogdian" +msgstr "Sogdčina" #. language code: som so #: zypp/LanguageCode.cc:983 @@ -3837,7 +3837,7 @@ msgstr "Songhai" #. language code: sot st #: zypp/LanguageCode.cc:987 msgid "Sotho, Southern" -msgstr "Sotho, Southern" +msgstr "Soto" #. language code: spa es #: zypp/LanguageCode.cc:989 @@ -3897,7 +3897,7 @@ msgstr "Švédsky" #. language code: syr #: zypp/LanguageCode.cc:1011 msgid "Syriac" -msgstr "Syriac" +msgstr "Sýrčina" #. language code: tah ty #: zypp/LanguageCode.cc:1013 @@ -3987,12 +3987,12 @@ msgstr "Tlingit" #. language code: tmh #: zypp/LanguageCode.cc:1051 msgid "Tamashek" -msgstr "Tamashek" +msgstr "Tamašek" #. language code: tog #: zypp/LanguageCode.cc:1053 msgid "Tonga (Nyasa)" -msgstr "Tonga (Nyasa)" +msgstr "Tongčina (Nyasa)" #. language code: ton to #: zypp/LanguageCode.cc:1055 @@ -4007,12 +4007,12 @@ msgstr "Tok Pisin" #. language code: tsi #: zypp/LanguageCode.cc:1059 msgid "Tsimshian" -msgstr "Tsimshian" +msgstr "Tsimshijské jazyky" #. language code: tsn tn #: zypp/LanguageCode.cc:1061 msgid "Tswana" -msgstr "Tswana" +msgstr "Čwančina" #. language code: tso ts #: zypp/LanguageCode.cc:1063 @@ -4032,7 +4032,7 @@ msgstr "Tumbuka" #. language code: tup #: zypp/LanguageCode.cc:1069 msgid "Tupi Languages" -msgstr "Tupi Languages" +msgstr "Jazyky tupi" #. language code: tur tr #: zypp/LanguageCode.cc:1071 @@ -4042,7 +4042,7 @@ msgstr "Turecký" #. language code: tut #: zypp/LanguageCode.cc:1073 msgid "Altaic (Other)" -msgstr "Altaic (Other)" +msgstr "Altajské jazyky" #. language code: twi tw #: zypp/LanguageCode.cc:1077 @@ -4052,17 +4052,17 @@ msgstr "Twi" #. language code: tyv #: zypp/LanguageCode.cc:1079 msgid "Tuvinian" -msgstr "Tuvinian" +msgstr "Tuviančina" #. language code: udm #: zypp/LanguageCode.cc:1081 msgid "Udmurt" -msgstr "Udmurt" +msgstr "Udmurtčina" #. language code: uga #: zypp/LanguageCode.cc:1083 msgid "Ugaritic" -msgstr "Ugaritic" +msgstr "Ugaritčina" #. language code: uig ug #: zypp/LanguageCode.cc:1085 @@ -4112,22 +4112,22 @@ msgstr "Vietnamský" #. language code: vol vo #: zypp/LanguageCode.cc:1103 msgid "Volapuk" -msgstr "Volapuk" +msgstr "Volapük" #. language code: vot #: zypp/LanguageCode.cc:1105 msgid "Votic" -msgstr "Votic" +msgstr "Vodčina" #. language code: wak #: zypp/LanguageCode.cc:1107 msgid "Wakashan Languages" -msgstr "Wakashan Languages" +msgstr "Wakašské jazyky" #. language code: wal #: zypp/LanguageCode.cc:1109 msgid "Walamo" -msgstr "Walamo" +msgstr "Walamčina" #. language code: war #: zypp/LanguageCode.cc:1111 @@ -4147,7 +4147,7 @@ msgstr "Welšský" #. language code: wen #: zypp/LanguageCode.cc:1119 msgid "Sorbian Languages" -msgstr "Sorbian Languages" +msgstr "Srbské jazyky" #. language code: wln wa #: zypp/LanguageCode.cc:1121 @@ -4162,7 +4162,7 @@ msgstr "Wolof" #. language code: xal #: zypp/LanguageCode.cc:1125 msgid "Kalmyk" -msgstr "Kalmyk" +msgstr "Kalmyčtina" #. language code: xho xh #: zypp/LanguageCode.cc:1127 @@ -4177,7 +4177,7 @@ msgstr "Yao" #. language code: yap #: zypp/LanguageCode.cc:1131 msgid "Yapese" -msgstr "Yapese" +msgstr "Japčina" #. language code: yid yi #: zypp/LanguageCode.cc:1133 @@ -4192,12 +4192,12 @@ msgstr "Yoruba" #. language code: ypk #: zypp/LanguageCode.cc:1137 msgid "Yupik Languages" -msgstr "Yupik Languages" +msgstr "Yupické jazyky" #. language code: zap #: zypp/LanguageCode.cc:1139 msgid "Zapotec" -msgstr "Zapotec" +msgstr "Zapotéčtina" #. language code: zen #: zypp/LanguageCode.cc:1141 @@ -4207,7 +4207,7 @@ msgstr "Zenaga" #. language code: zha za #: zypp/LanguageCode.cc:1143 msgid "Zhuang" -msgstr "Zhuang" +msgstr "Čuangčina" #. language code: znd #: zypp/LanguageCode.cc:1145 diff --git a/po/zh_CN.po b/po/zh_CN.po index bf40905..bc45356 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,15 +12,16 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-03 15:55+0200\n" -"PO-Revision-Date: 2015-12-23 18:11+0800\n" -"Last-Translator: marguerite \n" -"Language-Team: Chinese \n" +"PO-Revision-Date: 2016-06-07 09:12+0000\n" +"Last-Translator: SLE Merge Robot \n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\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 @@ -62,7 +63,7 @@ msgstr "无法初始化递归的 mutex" #: zypp/thread/Mutex.cc:77 msgid "Can't acquire the mutex lock" -msgstr "无法取得 mutex 锁定" +msgstr "无法获取 mutex 锁定" #: zypp/thread/Mutex.cc:87 msgid "Can't release the mutex lock" @@ -98,7 +99,7 @@ msgstr "建议" #: zypp/Dep.cc:103 msgid "Enhances" -msgstr "扩展" +msgstr "增强" #: zypp/Dep.cc:104 msgid "Supplements" @@ -128,7 +129,7 @@ msgstr "%s 早已作为 %s 执行了)" #: zypp/target/TargetImpl.cc:459 msgid " execution skipped while aborting" -msgstr " 执行在中止时被跳过" +msgstr " 中止时跳过执行" #: zypp/target/TargetImpl.cc:514 zypp/target/TargetImpl.cc:534 #: zypp/target/TargetImpl.cc:562 zypp/target/TargetImpl.cc:599 @@ -180,7 +181,7 @@ msgstr "无法初始化 HAL 环境 － hald 未运行？" #: zypp/target/hal/HalContext.cc:851 msgid "Not a CDROM drive" -msgstr "不是一个 CDROM 驱动器" +msgstr "不是 CDROM 驱动器" #. TranslatorExplanation after semicolon is error message #. TranslatorExplanation the colon is followed by an error message diff --git a/zypp/ResPool.h b/zypp/ResPool.h index 2776718..b64b7ad 100644 --- a/zypp/ResPool.h +++ b/zypp/ResPool.h @@ -312,7 +312,7 @@ namespace zypp repository_iterator knownRepositoriesEnd() const; /** Find a \ref Repository named \c alias_r. - * Returns \ref Repository::norepository if there is no such \ref Repository. + * Returns \ref Repository::noRepository if there is no such \ref Repository. */ Repository reposFind( const std::string & alias_r ) const; diff --git a/zypp/sat/Pool.h b/zypp/sat/Pool.h index 61ca89a..0bdddd5 100644 --- a/zypp/sat/Pool.h +++ b/zypp/sat/Pool.h @@ -97,7 +97,7 @@ namespace zypp Repository reposInsert( const std::string & alias_r ); /** Find a \ref Repository named \c alias_r. - * Returns \ref norepository if there is no such \ref Repository. + * Returns \ref noRepository if there is no such \ref Repository. */ Repository reposFind( const std::string & alias_r ) const; @@ -107,6 +107,13 @@ namespace zypp void reposErase( const std::string & alias_r ) { reposFind( alias_r ).eraseFromPool(); } + /** Remove all repos from the pool. + * This also shrinks a pool which may have become large + * after having added and removed repos lots of times. + */ + void reposEraseAll() + { while ( ! reposEmpty() ) reposErase( reposBegin()->alias() ); } + public: /** Reserved system repository alias \c @System. */ static const std::string & systemRepoAlias(); diff --git a/zypp/sat/detail/PoolImpl.cc b/zypp/sat/detail/PoolImpl.cc index 5a5de13..89936d3 100644 --- a/zypp/sat/detail/PoolImpl.cc +++ b/zypp/sat/detail/PoolImpl.cc @@ -91,6 +91,8 @@ namespace zypp ///////////////////////////////////////////////////////////////// + const bool resusePoolIDs = true; + const std::string & PoolImpl::systemRepoAlias() { static const std::string _val( "@System" ); @@ -103,7 +105,6 @@ namespace zypp return _val; } - ///////////////////////////////////////////////////////////////// static void logSat( CPool *, void *data, int type, const char *logString ) @@ -304,7 +305,9 @@ namespace zypp if ( isSystemRepo( repo_r ) ) _autoinstalled.clear(); eraseRepoInfo( repo_r ); - ::repo_free( repo_r, /*reuseids*/false ); + ::repo_free( repo_r, resusePoolIDs ); + if ( resusePoolIDs && !_pool->urepos ) // If the last repo is removed clear the pool to actually reuse all IDs. + ::pool_freeallrepos( _pool, resusePoolIDs ); } int PoolImpl::_addSolv( CRepo * repo_r, FILE * file_r ) @@ -356,14 +359,14 @@ namespace zypp else if ( blockSize ) { // Free remembered entries - ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false ); + ::repo_free_solvable_block( repo_r, blockBegin, blockSize, resusePoolIDs ); blockBegin = blockSize = 0; } } if ( blockSize ) { // Free remembered entries - ::repo_free_solvable_block( repo_r, blockBegin, blockSize, /*reuseids*/false ); + ::repo_free_solvable_block( repo_r, blockBegin, blockSize, resusePoolIDs ); blockBegin = blockSize = 0; } } diff --git a/zypp/sat/detail/PoolImpl.h b/zypp/sat/detail/PoolImpl.h index 915e753..77ced71 100644 --- a/zypp/sat/detail/PoolImpl.h +++ b/zypp/sat/detail/PoolImpl.h @@ -123,7 +123,7 @@ namespace zypp /** Creating a new repo named \a name_r. */ CRepo * _createRepo( const std::string & name_r ); - /** Creating a new repo named \a name_r. */ + /** Delete repo \a repo_r from pool. */ void _deleteRepo( CRepo * repo_r ); /** Adding solv file to a repo. -- 2.7.4