Imported Upstream version 16.0.2

Change-Id: I9eafc60cc547505f000b34896f528e402baab93a
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 25d3b46..a91f980 100644 (file)
--- 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 "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 16.0.1 (0)
+# LAST RELEASED: 16.0.2 (0)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 923ddd8..49036bf 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Jun  7 18:43:31 CEST 2016 - ma@suse.de
+
+- Allow PackageKit to drop the zypp lock (bnc#899755)
+- Avoid superfluous rebuilding of indices when solving
+- version 16.0.2 (0)
+
+-------------------------------------------------------------------
 Sun Jun  5 16:12:42 CEST 2016 - ma@suse.de
 
 - po: upadte makefiles

diff --git a/po/ca.po b/po/ca.po
index cd708ab..7950a74 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,16 +9,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: 2016-05-17 15:26+0000\n"
+"PO-Revision-Date: 2016-06-03 14:25+0000\n"
 "Last-Translator: David Medina <medipas@gmail.com>\n"
-"Language-Team: Catalan <http://l10n.opensuse.org/projects/libzypp/master/ca/>"
-"\n"
+"Language-Team: Catalan "
+"<https://l10n.opensuse.org/projects/libzypp/master/ca/>\n"
 "Language: ca\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: Weblate 2.5\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
@@ -4871,7 +4871,7 @@ msgstr "instal·la %s del repositori exclòs"
 #: zypp/solver/detail/SATResolver.cc:1318
 #, c-format, boost-format
 msgid "downgrade of %s to %s"
-msgstr "desactualizació de %s a %s"
+msgstr "degradació de %s a %s"
 
 #: zypp/solver/detail/SATResolver.cc:1325
 #, c-format, boost-format

diff --git a/po/cs.po b/po/cs.po
index 61ee685..d7b497b 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,9 +20,10 @@ 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-05-28 19:15+0000\n"
-"Last-Translator: Martin Pluskal <mpluskal@suse.com>\n"
-"Language-Team: Czech <http://l10n.opensuse.org/projects/libzypp/master/cs/>\n"
+"PO-Revision-Date: 2016-05-31 11:55+0000\n"
+"Last-Translator: Sarah O'Farrell <sarah.ofarrell@vistatec.com>\n"
+"Language-Team: Czech <https://l10n.opensuse.org/projects/libzypp/master/cs/>"
+"\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/po/sk.po b/po/sk.po
index 2eef15f..feb0c3c 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ 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-19 17:32+0000\n"
+"PO-Revision-Date: 2016-05-29 10:45+0000\n"
 "Last-Translator: Ferdinand Galko <galko.ferdinand@gmail.com>\n"
 "Language-Team: Slovak <http://l10n.opensuse.org/projects/libzypp/master/sk/>"
 "\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 2.5\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
@@ -2852,7 +2852,7 @@ msgstr "Iránsky (ostatné)"
 #. language code: iro
 #: zypp/LanguageCode.cc:575
 msgid "Iroquoian Languages"
-msgstr "Iroquoian Languages"
+msgstr "Irokézske jazyky"
 
 #. language code: ita it
 #: zypp/LanguageCode.cc:577
@@ -2887,22 +2887,22 @@ msgstr "Židovsko-Arabský"
 #. language code: kaa
 #: zypp/LanguageCode.cc:589
 msgid "Kara-Kalpak"
-msgstr "Kara-Kalpak"
+msgstr "Karakalpačtina"
 
 #. language code: kab
 #: zypp/LanguageCode.cc:591
 msgid "Kabyle"
-msgstr "Kabyle"
+msgstr "Kabylčina"
 
 #. language code: kac
 #: zypp/LanguageCode.cc:593
 msgid "Kachin"
-msgstr "Kachin"
+msgstr "Kačjinčina"
 
 #. language code: kal kl
 #: zypp/LanguageCode.cc:595
 msgid "Kalaallisut"
-msgstr "Kalaallisut"
+msgstr "Grónčina"
 
 #. language code: kam
 #: zypp/LanguageCode.cc:597
@@ -2917,7 +2917,7 @@ msgstr "Kannada"
 #. language code: kar
 #: zypp/LanguageCode.cc:601
 msgid "Karen"
-msgstr "Karen"
+msgstr "Karenčina"
 
 #. language code: kas ks
 #: zypp/LanguageCode.cc:603
@@ -2942,17 +2942,17 @@ msgstr "Kazašský"
 #. language code: kbd
 #: zypp/LanguageCode.cc:611
 msgid "Kabardian"
-msgstr "Kabardian"
+msgstr "Kabardčina"
 
 #. language code: kha
 #: zypp/LanguageCode.cc:613
 msgid "Khasi"
-msgstr "Khasi"
+msgstr "Khasijčina"
 
 #. language code: khi
 #: zypp/LanguageCode.cc:615
 msgid "Khoisan (Other)"
-msgstr "Khoisan (Other)"
+msgstr "Khojsánske jazyky (iné)"
 
 #. language code: khm km
 #: zypp/LanguageCode.cc:617
@@ -2962,12 +2962,12 @@ msgstr "Khmer"
 #. language code: kho
 #: zypp/LanguageCode.cc:619
 msgid "Khotanese"
-msgstr "Khotanese"
+msgstr "Kotčina"
 
 #. language code: kik ki
 #: zypp/LanguageCode.cc:621
 msgid "Kikuyu"
-msgstr "Kikuyu"
+msgstr "Kikuju"
 
 #. language code: kin rw
 #: zypp/LanguageCode.cc:623
@@ -2987,12 +2987,12 @@ msgstr "Kimbundu"
 #. language code: kok
 #: zypp/LanguageCode.cc:629
 msgid "Konkani"
-msgstr "Konkani"
+msgstr "Konkánčina"
 
 #. language code: kom kv
 #: zypp/LanguageCode.cc:631
 msgid "Komi"
-msgstr "Komi"
+msgstr "Komijčina"
 
 #. language code: kon kg
 #: zypp/LanguageCode.cc:633
@@ -3007,7 +3007,7 @@ msgstr "Kórejský"
 #. language code: kos
 #: zypp/LanguageCode.cc:637
 msgid "Kosraean"
-msgstr "Kosraean"
+msgstr "Kusaie"
 
 #. language code: kpe
 #: zypp/LanguageCode.cc:639
@@ -3027,17 +3027,17 @@ msgstr "Kru"
 #. language code: kru
 #: zypp/LanguageCode.cc:645
 msgid "Kurukh"
-msgstr "Kurukh"
+msgstr "Kurukhčina"
 
 #. language code: kua kj
 #: zypp/LanguageCode.cc:647
 msgid "Kuanyama"
-msgstr "Kuanyama"
+msgstr "Kuaňama"
 
 #. language code: kum
 #: zypp/LanguageCode.cc:649
 msgid "Kumyk"
-msgstr "Kumyk"
+msgstr "Kumytčina"
 
 #. language code: kur ku
 #: zypp/LanguageCode.cc:651
@@ -3052,12 +3052,12 @@ msgstr "Kutenai"
 #. language code: lad
 #: zypp/LanguageCode.cc:655
 msgid "Ladino"
-msgstr "Ladino"
+msgstr "Ladinčina"
 
 #. language code: lah
 #: zypp/LanguageCode.cc:657
 msgid "Lahnda"
-msgstr "Lahnda"
+msgstr "Lahandčina"
 
 #. language code: lam
 #: zypp/LanguageCode.cc:659
@@ -3082,7 +3082,7 @@ msgstr "Lotyšský"
 #. language code: lez
 #: zypp/LanguageCode.cc:667
 msgid "Lezghian"
-msgstr "Lezghian"
+msgstr "Lezginčina"
 
 #. language code: lim li
 #: zypp/LanguageCode.cc:669
@@ -3117,7 +3117,7 @@ msgstr "Luxemburský"
 #. language code: lua
 #: zypp/LanguageCode.cc:681
 msgid "Luba-Lulua"
-msgstr "Luba-Lulua"
+msgstr "Luba-luluánčina"
 
 #. language code: lub lu
 #: zypp/LanguageCode.cc:683
@@ -3132,7 +3132,7 @@ msgstr "Ganda"
 #. language code: lui
 #: zypp/LanguageCode.cc:687
 msgid "Luiseno"
-msgstr "Luiseno"
+msgstr "Luiseňo"
 
 #. language code: lun
 #: zypp/LanguageCode.cc:689
@@ -3147,7 +3147,7 @@ msgstr "Luo (Keňa a Tanzánia)"
 #. language code: lus
 #: zypp/LanguageCode.cc:693
 msgid "Lushai"
-msgstr "Lushai"
+msgstr "Lušáí"
 
 #. language code: mac mkd mk
 #: zypp/LanguageCode.cc:695 zypp/LanguageCode.cc:697
@@ -3157,12 +3157,12 @@ msgstr "Macedónsky"
 #. language code: mad
 #: zypp/LanguageCode.cc:699
 msgid "Madurese"
-msgstr "Madurese"
+msgstr "Madurčina"
 
 #. language code: mag
 #: zypp/LanguageCode.cc:701
 msgid "Magahi"
-msgstr "Magahi"
+msgstr "Magahí"
 
 #. language code: mah mh
 #: zypp/LanguageCode.cc:703
@@ -3177,7 +3177,7 @@ msgstr "Maithili"
 #. language code: mak
 #: zypp/LanguageCode.cc:707
 msgid "Makasar"
-msgstr "Makasar"
+msgstr "Makasarčina"
 
 #. language code: mal ml
 #: zypp/LanguageCode.cc:709
@@ -3222,7 +3222,7 @@ msgstr "Moksha"
 #. language code: mdr
 #: zypp/LanguageCode.cc:729
 msgid "Mandar"
-msgstr "Mandar"
+msgstr "Mandarčina"
 
 #. language code: men
 #: zypp/LanguageCode.cc:731
@@ -3237,12 +3237,12 @@ msgstr "Írsky stredný (r. 900-1200)"
 #. language code: mic
 #: zypp/LanguageCode.cc:735
 msgid "Mi'kmaq"
-msgstr "Mi'kmaq"
+msgstr "Mikman"
 
 #. language code: min
 #: zypp/LanguageCode.cc:737
 msgid "Minangkabau"
-msgstr "Minangkabau"
+msgstr "Minangkabaučina"
 
 #. language code: mis
 #: zypp/LanguageCode.cc:739
@@ -3267,7 +3267,7 @@ msgstr "Maltézsky"
 #. language code: mnc
 #: zypp/LanguageCode.cc:747
 msgid "Manchu"
-msgstr "Manchu"
+msgstr "Mandžuština"
 
 #. language code: mni
 #: zypp/LanguageCode.cc:749
@@ -3277,7 +3277,7 @@ msgstr "Manipuri"
 #. language code: mno
 #: zypp/LanguageCode.cc:751
 msgid "Manobo Languages"
-msgstr "Manobo Languages"
+msgstr "Manobo jazyky"
 
 #. language code: moh
 #: zypp/LanguageCode.cc:753
@@ -3297,7 +3297,7 @@ msgstr "Mongolský"
 #. language code: mos
 #: zypp/LanguageCode.cc:759
 msgid "Mossi"
-msgstr "Mossi"
+msgstr "Mosi"
 
 #. language code: mul
 #: zypp/LanguageCode.cc:761
@@ -3307,12 +3307,12 @@ msgstr "Viaceré jazyky"
 #. language code: mun
 #: zypp/LanguageCode.cc:763
 msgid "Munda languages"
-msgstr "Munda languages"
+msgstr "Mundské jazyky"
 
 #. language code: mus
 #: zypp/LanguageCode.cc:765
 msgid "Creek"
-msgstr "Creek"
+msgstr "Muskogi"
 
 #. language code: mwl
 #: zypp/LanguageCode.cc:767
@@ -3352,17 +3352,17 @@ msgstr "Neapolitan"
 #. language code: nav nv
 #: zypp/LanguageCode.cc:783
 msgid "Navajo"
-msgstr "Navajo"
+msgstr "Navaho"
 
 #. language code: nbl nr
 #: zypp/LanguageCode.cc:785
 msgid "Ndebele, South"
-msgstr "Ndebele, South"
+msgstr "Ndebele (Južná Afrika)"
 
 #. language code: nde nd
 #: zypp/LanguageCode.cc:787
 msgid "Ndebele, North"
-msgstr "Ndebele, North"
+msgstr "Ndebele (Zimbabwe)"
 
 #. language code: ndo ng
 #: zypp/LanguageCode.cc:789
@@ -3397,7 +3397,7 @@ msgstr "Nigérisjko-Kordofanský (ostatné)"
 #. language code: niu
 #: zypp/LanguageCode.cc:801
 msgid "Niuean"
-msgstr "Niuean"
+msgstr "Niueština"
 
 #. language code: nno nn
 #: zypp/LanguageCode.cc:803
@@ -3412,7 +3412,7 @@ msgstr "Nórsky Bokmal"
 #. language code: nog
 #: zypp/LanguageCode.cc:807
 msgid "Nogai"
-msgstr "Nogai"
+msgstr "Nogidalčina"
 
 #. language code: non
 #: zypp/LanguageCode.cc:809
@@ -3432,7 +3432,7 @@ msgstr "Severné Sotho"
 #. language code: nub
 #: zypp/LanguageCode.cc:815
 msgid "Nubian Languages"
-msgstr "Nubian Languages"
+msgstr "Nubijiské jazyky"
 
 #. language code: nwc
 #: zypp/LanguageCode.cc:817
@@ -3442,22 +3442,22 @@ msgstr "Classical Newari"
 #. language code: nya ny
 #: zypp/LanguageCode.cc:819
 msgid "Chichewa"
-msgstr "Chichewa"
+msgstr "Ňandža"
 
 #. language code: nym
 #: zypp/LanguageCode.cc:821
 msgid "Nyamwezi"
-msgstr "Nyamwezi"
+msgstr "Ňamwezi"
 
 #. language code: nyn
 #: zypp/LanguageCode.cc:823
 msgid "Nyankole"
-msgstr "Nyankole"
+msgstr "Ňankole"
 
 #. language code: nyo
 #: zypp/LanguageCode.cc:825
 msgid "Nyoro"
-msgstr "Nyoro"
+msgstr "Ňoro"
 
 #. language code: nzi
 #: zypp/LanguageCode.cc:827
@@ -3472,7 +3472,7 @@ msgstr "Occitan (post 1500)"
 #. language code: oji oj
 #: zypp/LanguageCode.cc:831
 msgid "Ojibwa"
-msgstr "Ojibwa"
+msgstr "Odžibwa"
 
 #. language code: ori or
 #: zypp/LanguageCode.cc:833
@@ -3482,7 +3482,7 @@ msgstr "Oriya"
 #. language code: orm om
 #: zypp/LanguageCode.cc:835
 msgid "Oromo"
-msgstr "Oromo"
+msgstr "Oromčina"
 
 #. language code: osa
 #: zypp/LanguageCode.cc:837
@@ -3502,7 +3502,7 @@ msgstr "Turecký, Ottoman (1500-1928)"
 #. language code: oto
 #: zypp/LanguageCode.cc:843
 msgid "Otomian Languages"
-msgstr "Otomian Languages"
+msgstr "Oto-pameské jazyky"
 
 #. language code: paa
 #: zypp/LanguageCode.cc:845
@@ -3517,17 +3517,17 @@ msgstr "Pangasinan"
 #. language code: pal
 #: zypp/LanguageCode.cc:849
 msgid "Pahlavi"
-msgstr "Pahlavi"
+msgstr "Pahlaví"
 
 #. language code: pam
 #: zypp/LanguageCode.cc:851
 msgid "Pampanga"
-msgstr "Pampanga"
+msgstr "Pampangan"
 
 #. language code: pan pa
 #: zypp/LanguageCode.cc:853
 msgid "Panjabi"
-msgstr "Panjabi"
+msgstr "Pandžábčina"
 
 #. language code: pap
 #: zypp/LanguageCode.cc:855
@@ -3537,7 +3537,7 @@ msgstr "Papiamento"
 #. language code: pau
 #: zypp/LanguageCode.cc:857
 msgid "Palauan"
-msgstr "Palauan"
+msgstr "Palaučina"
 
 #. language code: peo
 #: zypp/LanguageCode.cc:859
@@ -3557,12 +3557,12 @@ msgstr "Filipíny (ostatné)"
 #. language code: phn
 #: zypp/LanguageCode.cc:867
 msgid "Phoenician"
-msgstr "Phoenician"
+msgstr "Péničtina"
 
 #. language code: pli pi
 #: zypp/LanguageCode.cc:869
 msgid "Pali"
-msgstr "Pali"
+msgstr "Pálí"
 
 #. language code: pol pl
 #: zypp/LanguageCode.cc:871
@@ -3572,7 +3572,7 @@ msgstr "Poľský"
 #. language code: pon
 #: zypp/LanguageCode.cc:873
 msgid "Pohnpeian"
-msgstr "Pohnpeian"
+msgstr "Pohnpeičina"
 
 #. language code: por pt
 #: zypp/LanguageCode.cc:875
@@ -3582,7 +3582,7 @@ msgstr "Portugalský"
 #. language code: pra
 #: zypp/LanguageCode.cc:877
 msgid "Prakrit Languages"
-msgstr "Prakrit Languages"
+msgstr "Prakritské jazyky"
 
 #. language code: pro
 #: zypp/LanguageCode.cc:879
@@ -3597,7 +3597,7 @@ msgstr "Pushto"
 #. language code: que qu
 #: zypp/LanguageCode.cc:883
 msgid "Quechua"
-msgstr "Quechua"
+msgstr "Kečuánčina"
 
 #. language code: raj
 #: zypp/LanguageCode.cc:885
@@ -3607,12 +3607,12 @@ msgstr "Radžastanský"
 #. language code: rap
 #: zypp/LanguageCode.cc:887
 msgid "Rapanui"
-msgstr "Rapanui"
+msgstr "Rapanujčina"
 
 #. language code: rar
 #: zypp/LanguageCode.cc:889
 msgid "Rarotongan"
-msgstr "Rarotongan"
+msgstr "Rarotongčina"
 
 #. language code: roa
 #: zypp/LanguageCode.cc:891
@@ -3622,12 +3622,12 @@ msgstr "Romance (ostatné)"
 #. language code: roh rm
 #: zypp/LanguageCode.cc:893
 msgid "Raeto-Romance"
-msgstr "Raeto-Romance"
+msgstr "Rétorománčina"
 
 #. language code: rom
 #: zypp/LanguageCode.cc:895
 msgid "Romany"
-msgstr "Romany"
+msgstr "Rómčina"
 
 #. language code: rum ron ro
 #: zypp/LanguageCode.cc:897 zypp/LanguageCode.cc:899
@@ -3667,12 +3667,12 @@ msgstr "Juhoamerický Indiánsky (ostatné)"
 #. language code: sal
 #: zypp/LanguageCode.cc:913
 msgid "Salishan Languages"
-msgstr "Salishan Languages"
+msgstr "Sališské jazyky"
 
 #. language code: sam
 #: zypp/LanguageCode.cc:915
 msgid "Samaritan Aramaic"
-msgstr "Samaritan Aramaic"
+msgstr "Samaritánska aramejčina"
 
 #. language code: san sa
 #: zypp/LanguageCode.cc:917
@@ -3682,7 +3682,7 @@ msgstr "Sanskrt"
 #. language code: sas
 #: zypp/LanguageCode.cc:919
 msgid "Sasak"
-msgstr "Sasak"
+msgstr "Sasačtina"
 
 #. language code: sat
 #: zypp/LanguageCode.cc:921
@@ -3712,7 +3712,7 @@ msgstr "Chorvátsky"
 #. language code: sel
 #: zypp/LanguageCode.cc:935
 msgid "Selkup"
-msgstr "Selkup"
+msgstr "Selkupčina"
 
 #. language code: sem
 #: zypp/LanguageCode.cc:937
@@ -3727,12 +3727,12 @@ msgstr "Írsky starý (do r. 900)"
 #. language code: sgn
 #: zypp/LanguageCode.cc:941
 msgid "Sign Languages"
-msgstr "Sign Languages"
+msgstr "Znakové jazyky"
 
 #. language code: shn
 #: zypp/LanguageCode.cc:943
 msgid "Shan"
-msgstr "Shan"
+msgstr "Šančina"
 
 #. language code: sid
 #: zypp/LanguageCode.cc:945
@@ -3747,7 +3747,7 @@ msgstr "Sinhala"
 #. language code: sio
 #: zypp/LanguageCode.cc:949
 msgid "Siouan Languages"
-msgstr "Siouan Languages"
+msgstr "Siouské jazyky"
 
 #. language code: sit
 #: zypp/LanguageCode.cc:951

diff --git a/zypp/ZYpp.cc b/zypp/ZYpp.cc
index babffdf..ef57d94 100644 (file)
--- a/zypp/ZYpp.cc
+++ b/zypp/ZYpp.cc
@@ -23,12 +23,8 @@ using std::endl;
 namespace zypp
 { /////////////////////////////////////////////////////////////////
 
-  ZYpp::ZYpp( const Impl_Ptr & impl_r )
-  : _pimpl( impl_r )
-  {}
-
-  ZYpp::~ZYpp()
-  {}
+  // class ZYpp:
+  // ctor and dtor implemented in  ZYppFactory.cc
 
   std::ostream & operator<<( std::ostream & str, const ZYpp & obj )
   { return str << *obj._pimpl; }

diff --git a/zypp/ZYppFactory.cc b/zypp/ZYppFactory.cc
index 10ff5ff..03ea897 100644 (file)
--- a/zypp/ZYppFactory.cc
+++ b/zypp/ZYppFactory.cc
@@ -282,14 +282,35 @@ namespace zypp
 
   };
 
+  ///////////////////////////////////////////////////////////////////
   namespace
   {
-    static ZYppGlobalLock & globalLock()
+    static weak_ptr<ZYpp>              _theZYppInstance;
+    static scoped_ptr<ZYppGlobalLock>  _theGlobalLock;         // on/off in sync with _theZYppInstance
+
+    ZYppGlobalLock & globalLock()
     {
-      static ZYppGlobalLock lock;
-      return lock;
+      if ( !_theGlobalLock )
+       _theGlobalLock.reset( new ZYppGlobalLock );
+      return *_theGlobalLock;
     }
-    bool           _haveZYpp = false;
+  } //namespace
+  ///////////////////////////////////////////////////////////////////
+
+  ///////////////////////////////////////////////////////////////////
+  //
+  //   CLASS NAME : ZYpp
+  //
+  ///////////////////////////////////////////////////////////////////
+
+  ZYpp::ZYpp( const Impl_Ptr & impl_r )
+  : _pimpl( impl_r )
+  {
+  }
+
+  ZYpp::~ZYpp()
+  {
+    _theGlobalLock.reset();
   }
 
   ///////////////////////////////////////////////////////////////////
@@ -313,31 +334,12 @@ namespace zypp
   //
   ///////////////////////////////////////////////////////////////////
 
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : ZYppFactory::instance
-  //   METHOD TYPE : ZYppFactory
-  //
   ZYppFactory ZYppFactory::instance()
-  {
-    return ZYppFactory();
-  }
+  { return ZYppFactory(); }
 
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : ZYppFactory::ZYppFactory
-  //   METHOD TYPE : Ctor
-  //
   ZYppFactory::ZYppFactory()
-  {
-
-  }
+  {}
 
-  ///////////////////////////////////////////////////////////////////
-  //
-  //   METHOD NAME : ZYppFactory::~ZYppFactory
-  //   METHOD TYPE : Dtor
-  //
   ZYppFactory::~ZYppFactory()
   {}
 
@@ -345,8 +347,7 @@ namespace zypp
   //
   ZYpp::Ptr ZYppFactory::getZYpp() const
   {
-    static ZYpp::Ptr _instance;
-
+    ZYpp::Ptr _instance = _theZYppInstance.lock();
     if ( ! _instance )
     {
       if ( geteuid() != 0 )
@@ -387,7 +388,6 @@ namespace zypp
              }
            }
          }
-
        }
        if ( failed )
        {
@@ -400,9 +400,11 @@ namespace zypp
        }
       }
       // Here we go...
-      _instance.reset( new ZYpp( ZYpp::Impl_Ptr(new ZYpp::Impl) ) );
-      if ( _instance )
-        _haveZYpp = true;
+      static ZYpp::Impl_Ptr _theImplInstance;  // for now created once
+      if ( !_theImplInstance )
+       _theImplInstance.reset( new ZYpp::Impl );
+      _instance.reset( new ZYpp( _theImplInstance ) );
+      _theZYppInstance = _instance;
     }
 
     return _instance;
@@ -411,7 +413,7 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////
   //
   bool ZYppFactory::haveZYpp() const
-  { return _haveZYpp; }
+  { return !_theZYppInstance.expired(); }
 
   /******************************************************************
   **

diff --git a/zypp/sat/Pool.cc b/zypp/sat/Pool.cc
index f6694ac..831c4af 100644 (file)
--- a/zypp/sat/Pool.cc
+++ b/zypp/sat/Pool.cc
@@ -58,9 +58,6 @@ namespace zypp
     void Pool::prepare() const
     { return myPool().prepare(); }
 
-    void Pool::prepareForSolving() const
-    { return myPool().prepareForSolving(); }
-
     Pathname Pool::rootDir() const
     { return myPool().rootDir(); }
 

diff --git a/zypp/sat/Pool.h b/zypp/sat/Pool.h
index b02d2b3..61ca89a 100644 (file)
--- a/zypp/sat/Pool.h
+++ b/zypp/sat/Pool.h
@@ -67,9 +67,6 @@ namespace zypp
         /** Update housekeeping data if necessary (e.g. whatprovides). */
         void prepare() const;
 
-       /** \ref prepare plus some expensive checks done before solving only. */
-       void prepareForSolving() const;
-
        /** Get rootdir (for file conflicts check) */
        Pathname rootDir() const;
 

diff --git a/zypp/sat/detail/PoolImpl.cc b/zypp/sat/detail/PoolImpl.cc
index 80ed3ba..5a5de13 100644 (file)
--- a/zypp/sat/detail/PoolImpl.cc
+++ b/zypp/sat/detail/PoolImpl.cc
@@ -258,9 +258,15 @@ namespace zypp
         ::pool_freewhatprovides( _pool );
       }
 
-
       void PoolImpl::prepare() const
       {
+       // additional /etc/sysconfig/storage check:
+       static WatchFile sysconfigFile( sysconfigStoragePath(), WatchFile::NO_INIT );
+       if ( sysconfigFile.hasChanged() )
+       {
+         _requiredFilesystemsPtr.reset(); // recreated on demand
+         const_cast<PoolImpl*>(this)->depSetDirty( "/etc/sysconfig/storage change" );
+       }
        if ( _watcher.remember( _serial ) )
         {
           // After repo/solvable add/remove:
@@ -281,19 +287,6 @@ namespace zypp
         }
       }
 
-      void PoolImpl::prepareForSolving() const
-      {
-       // additional /etc/sysconfig/storage check:
-       static WatchFile sysconfigFile( sysconfigStoragePath(), WatchFile::NO_INIT );
-       if ( sysconfigFile.hasChanged() )
-       {
-         _requiredFilesystemsPtr.reset(); // recreated on demand
-         const_cast<PoolImpl*>(this)->depSetDirty( "/etc/sysconfig/storage change" );
-       }
-       // finally prepare as usual:
-       prepare();
-      }
-
       ///////////////////////////////////////////////////////////////////
 
       CRepo * PoolImpl::_createRepo( const std::string & name_r )

diff --git a/zypp/sat/detail/PoolImpl.h b/zypp/sat/detail/PoolImpl.h
index 6d75452..915e753 100644 (file)
--- a/zypp/sat/detail/PoolImpl.h
+++ b/zypp/sat/detail/PoolImpl.h
@@ -70,8 +70,6 @@ namespace zypp
            * \todo actually requires a watcher.
            */
           void prepare() const;
-         /** \ref prepare plus some expensive checks done before solving only. */
-         void prepareForSolving() const;
 
         private:
           /** Invalidate housekeeping data (e.g. whatprovides) if the

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 85acbd4..1a3c92d 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -412,7 +412,7 @@ SATResolver::solving(const CapabilitySet & requires_caps,
     HACKENV( SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE,_dup_allowvendorchange );
 #undef HACKENV
 #endif
-    sat::Pool::instance().prepareForSolving();
+    sat::Pool::instance().prepare();
 
     // Solve !
     MIL << "Starting solving...." << endl;
@@ -838,7 +838,7 @@ void SATResolver::doUpdate()
     solver_set_flag(_satSolver, SOLVER_FLAG_NO_UPDATEPROVIDE, _noupdateprovide);
     solver_set_flag(_satSolver, SOLVER_FLAG_IGNORE_RECOMMENDED, _onlyRequires);
 
-    sat::Pool::instance().prepareForSolving();
+    sat::Pool::instance().prepare();
 
     // Solve !
     MIL << "Starting solving for update...." << endl;