Imported Upstream version 14.41.0

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 45e64d9..455db4c 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
-SET(LIBZYPP_MINOR "40")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_MINOR "41")
+SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 14.40.2 (39)
+# LAST RELEASED: 14.41.0 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 4d26451..e80aaa6 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,25 @@
 -------------------------------------------------------------------
+Mon Sep  7 09:41:44 CEST 2015 - ma@suse.de
+
+- Don't cache repo releasever (bnc#943563)
+- version 14.41.0 (39)
+
+-------------------------------------------------------------------
+Thu Sep  3 01:14:27 CEST 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Aug 27 01:14:57 CEST 2015 - ma@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Aug 13 01:14:45 CEST 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
 Wed Aug 12 18:09:22 CEST 2015 - ma@suse.de
 
 - Fix setting dup_allow* solver options (bnc#941463)

diff --git a/po/sle-zypp-po.tar.bz2 b/po/sle-zypp-po.tar.bz2
index 5057b68..648fd03 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 b15edc0..97b57bf 100644 (file)
Binary files a/po/zypp-po.tar.bz2 and b/po/zypp-po.tar.bz2 differ

diff --git a/zypp/repo/RepoVariables.cc b/zypp/repo/RepoVariables.cc
index d53e534..93c0f20 100644 (file)
--- a/zypp/repo/RepoVariables.cc
+++ b/zypp/repo/RepoVariables.cc
@@ -21,6 +21,7 @@ using std::endl;
 #include "zypp/base/String.h"
 #include "zypp/base/Regex.h"
 
+#include "zypp/ZYppFactory.h"
 #include "zypp/ZConfig.h"
 #include "zypp/Target.h"
 #include "zypp/Arch.h"
@@ -389,6 +390,23 @@ namespace zypp
     ///////////////////////////////////////////////////////////////////
     namespace
     {
+      inline std::string getReleaseverString()
+      {
+       std::string ret( env::ZYPP_REPO_RELEASEVER() );
+       if( ret.empty() )
+       {
+         Target_Ptr trg( getZYpp()->getTarget() );
+         if ( trg )
+           ret = trg->distributionVersion();
+         else
+           ret = Target::distributionVersion( Pathname()/*guess*/ );
+       }
+       else
+         WAR << "ENV overwrites $releasever=" << ret << endl;
+
+       return ret;
+      }
+
       /** \brief Provide lazy initialized repo variables
        */
       struct RepoVars : private zypp::base::NonCopyable
@@ -438,14 +456,11 @@ namespace zypp
 
        void assertReleaseverStr() const
        {
-         if ( _releasever.empty() )
+         // check for changing releasever (bnc#943563)
+         std::string check( getReleaseverString() );
+         if ( check != _releasever )
          {
-           _releasever = env::ZYPP_REPO_RELEASEVER();
-           if( _releasever.empty() )
-             _releasever = Target::distributionVersion( Pathname()/*guess*/ );
-           else
-             WAR << "ENV overwrites $releasever=" << _releasever << endl;
-
+           _releasever = std::move(check);
            // split major/minor for SLE
            std::string::size_type pos = _releasever.find( "." );
            if ( pos == std::string::npos )