Author: mlandres Date: Mon Dec 17 14:06:08 2007 New Revision: 8115 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8115&view=rev Log: Fixed default text locale detection not to use static variables. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=8115&r1=8114&r2=8115&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Mon Dec 17 14:06:08 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "1") SET(LIBZYPP_COMPATMINOR "1") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "6") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=8115&r1=8114&r2=8115&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Dec 17 14:06:08 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 17 13:47:44 CET 2007 - ma@suse.de + +- +- version 4.1.6 +- revision + +------------------------------------------------------------------- Mon Dec 10 12:46:26 CET 2007 - ma@suse.de - Log more details about zypp lock owner. (#294094) Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=8115&r1=8114&r2=8115&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Mon Dec 17 14:06:08 2007 @@ -12,7 +12,6 @@ SET( zypp_SRCS ZConfig.cc - LanguageCode.cc Arch.cc Atom.cc ByteCount.cc @@ -21,13 +20,11 @@ CapMatch.cc CapSet.cc CheckSum.cc - CountryCode.cc Date.cc Dep.cc Dependencies.cc Edition.cc Language.cc - Locale.cc NVR.cc NVRA.cc NVRAD.cc @@ -88,6 +85,9 @@ RepoManager.cc MediaProducts.cc Locks.cc + LanguageCode.cc + CountryCode.cc + Locale.cc ) SET( zypp_HEADERS Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc?rev=8115&r1=8114&r2=8115&view=diff ============================================================================== --- trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc (original) +++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Mon Dec 17 14:06:08 2007 @@ -51,7 +51,7 @@ if ( envstr != "POSIX" && envstr != "C" ) { Locale lang( envlang ); - if ( lang != Locale::noCode ) + if ( ! lang.code().empty() ) { ret = lang; break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org