Imported Upstream version 15.19.6

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 484616e..0fc74bf 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "15")
 SET(LIBZYPP_COMPATMINOR "19")
 SET(LIBZYPP_MINOR "19")
-SET(LIBZYPP_PATCH "5")
+SET(LIBZYPP_PATCH "6")
 #
-# LAST RELEASED: 15.19.5 (19)
+# LAST RELEASED: 15.19.6 (19)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 4ba32e7..ac497de 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,36 @@
 -------------------------------------------------------------------
+Fri Nov  6 11:08:46 CET 2015 - ma@suse.de
+
+- Add testcase for uncached repo-variables.
+- Fixed Japanese translations (bsc#949196)
+- version 15.19.6 (19)
+
+-------------------------------------------------------------------
+Fri Nov  6 10:56:44 CET 2015 - ma@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Nov  5 01:15:12 CET 2015 - ma@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Nov  5 01:13:24 CET 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Nov  3 10:52:01 CET 2015 - ma@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Tue Nov  3 10:51:43 CET 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
 Fri Oct 23 17:10:18 CEST 2015 - ma@suse.de
 
 - Fix broken product: <-> -release package relation (bnc#951782)

diff --git a/po/sle-zypp-po.tar.bz2 b/po/sle-zypp-po.tar.bz2
index 4be506d..24c58bd 100644 (file)
Binary files a/po/sle-zypp-po.tar.bz2 and b/po/sle-zypp-po.tar.bz2 differ

diff --git a/po/zypp-po.tar.bz2 b/po/zypp-po.tar.bz2
index b8e8857..50a00e6 100644 (file)
Binary files a/po/zypp-po.tar.bz2 and b/po/zypp-po.tar.bz2 differ

diff --git a/tests/repo/RepoVariables_test.cc b/tests/repo/RepoVariables_test.cc
index 892e9ab..b399f5c 100644 (file)
--- a/tests/repo/RepoVariables_test.cc
+++ b/tests/repo/RepoVariables_test.cc
@@ -225,4 +225,12 @@ BOOST_AUTO_TEST_CASE(replace_text)
                    "http://site.org/update/13.2/?arch=i686");
 }
 
+BOOST_AUTO_TEST_CASE(uncached)
+{
+  ::setenv( "ZYPP_REPO_RELEASEVER", "13.2", 1 );
+  repo::RepoVariablesStringReplacer replacer1;
+  BOOST_CHECK_EQUAL( replacer1("${releasever}"),       "13.2" );
+  ::setenv( "ZYPP_REPO_RELEASEVER", "13.3", 1 );
+  BOOST_CHECK_EQUAL( replacer1("${releasever}"),       "13.3" );
+}
 // vim: set ts=2 sts=2 sw=2 ai et:

diff --git a/zypp/RepoInfo.cc b/zypp/RepoInfo.cc
index 09b3472..3956812 100644 (file)
--- a/zypp/RepoInfo.cc
+++ b/zypp/RepoInfo.cc
@@ -58,6 +58,7 @@ namespace zypp
 
   public:
     static const unsigned defaultPriority = 99;
+    static const unsigned noPriority = unsigned(-1);
 
     void setProbedType( const repo::RepoType & t ) const
     {
@@ -258,6 +259,9 @@ namespace zypp
   unsigned RepoInfo::defaultPriority()
   { return Impl::defaultPriority; }
 
+  unsigned RepoInfo::noPriority()
+  { return Impl::noPriority; }
+
   void RepoInfo::setPriority( unsigned newval_r )
   { _pimpl->priority = newval_r ? newval_r : Impl::defaultPriority; }
 

diff --git a/zypp/RepoInfo.h b/zypp/RepoInfo.h
index c2b9cdc..680c2b8 100644 (file)
--- a/zypp/RepoInfo.h
+++ b/zypp/RepoInfo.h
@@ -85,6 +85,10 @@ namespace zypp
        */
       static unsigned defaultPriority();
       /**
+       * The least priority (<tt>unsigned(-1)</tt>). 
+       */
+      static unsigned noPriority();
+      /**
        * Repository priority for solver.
        * Some number between \c 1 (highest priority) and \c 99 (\ref defaultPriority).
        */

diff --git a/zypp/base/String.h b/zypp/base/String.h
index 15a5799..9f02667 100644 (file)
--- a/zypp/base/String.h
+++ b/zypp/base/String.h
@@ -346,6 +346,20 @@ namespace zypp
     inline std::string octstring( unsigned long long n, int w = 0 ) { return form( "%#0*llo",  w, n ); }
     //@}
 
+
+    ///////////////////////////////////////////////////////////////////
+    /** String representation of number as bit-string with leading '0's. */
+    template <typename TInt>
+    std::string binstring( TInt val_r )
+    {
+      constexpr unsigned bits = sizeof(TInt)*8;
+      std::string ret( bits, ' ' );
+      TInt bit = 1;
+      for ( unsigned pos = bits; pos > 0; )
+      { --pos; ret[pos] = ((val_r & bit)?'1':'0'); bit = bit<<1; }
+      return ret;
+    }
+    
     ///////////////////////////////////////////////////////////////////
     /** Parsing numbers from string.
     */