Imported Upstream version 14.40.1

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

diff --git a/VERSION.cmake b/VERSION.cmake
index d6e83a5..122a274 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "40")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
 #
-# LAST RELEASED: 14.40.0 (39)
+# LAST RELEASED: 14.40.1 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 5fb1ad2..886061e 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,21 @@
 -------------------------------------------------------------------
+Wed Aug 12 15:49:49 CEST 2015 - ma@suse.de
+
+- Don't make zypper encode {} around repo vars (bnc#941453)
+- Support for MIPS architectures
+- version 14.40.1 (39)
+
+-------------------------------------------------------------------
+Sun Aug  2 01:14:24 CEST 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Mon Jul 27 09:54:15 CEST 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
 Fri Jul  3 15:24:15 CEST 2015 - ma@suse.de
 
 - Resolver allow tuning DUP mode solver flags (FATE#319128)

diff --git a/po/zypp-po.tar.bz2 b/po/zypp-po.tar.bz2
index 8de47f2..b15edc0 100644 (file)
Binary files a/po/zypp-po.tar.bz2 and b/po/zypp-po.tar.bz2 differ

diff --git a/tests/zypp/Url_test.cc b/tests/zypp/Url_test.cc
index 60d8e49..ad82d48 100644 (file)
--- a/tests/zypp/Url_test.cc
+++ b/tests/zypp/Url_test.cc
@@ -273,6 +273,13 @@ BOOST_AUTO_TEST_CASE( test_url4)
   }
 }
 
+BOOST_AUTO_TEST_CASE( test_url5)
+{
+  std::string str( "file:/some/${var:+path}/${var:-with}/${vars}" );
+  BOOST_CHECK_EQUAL( Url(str).asString(), str );
+  BOOST_CHECK_EQUAL( Url(zypp::url::encode( str, URL_SAFE_CHARS )).asString(), str );
+}
+
 BOOST_AUTO_TEST_CASE(plugin_querystring_args)
 {
   // url querysting options without value must be possible

diff --git a/zypp/Arch.cc b/zypp/Arch.cc
index 37aea0e..05ec4a3 100644 (file)
--- a/zypp/Arch.cc
+++ b/zypp/Arch.cc
@@ -210,7 +210,12 @@ namespace zypp
   DEF_BUILTIN( sh4 );
   DEF_BUILTIN( sh4a );
 
-  DEF_BUILTIN(m68k);
+  DEF_BUILTIN( m68k );
+
+  DEF_BUILTIN( mips );
+  DEF_BUILTIN( mipsel );
+  DEF_BUILTIN( mips64 );
+  DEF_BUILTIN( mips64el );
 #undef DEF_BUILTIN
 
   ///////////////////////////////////////////////////////////////////
@@ -347,7 +352,12 @@ namespace zypp
         defCompatibleWith( _sh4(),             _noarch() );
         defCompatibleWith( _sh4a(),            _noarch(),_sh4() );
 
-        defCompatibleWith(_m68k(),             _noarch());
+        defCompatibleWith( _m68k(),            _noarch() );
+
+       defCompatibleWith( _mips(),             _noarch() );
+       defCompatibleWith( _mipsel(),           _noarch() );
+       defCompatibleWith( _mips64(),           _noarch() );
+       defCompatibleWith( _mips64el(),         _noarch() );
         //
         ///////////////////////////////////////////////////////////////////
         // dumpOn( USR ) << endl;

diff --git a/zypp/Arch.h b/zypp/Arch.h
index fb2a447..a87e030 100644 (file)
--- a/zypp/Arch.h
+++ b/zypp/Arch.h
@@ -265,6 +265,15 @@ namespace zypp
 
   /** \relates Arch */
   extern const Arch Arch_m68k;
+
+  /** \relates Arch */
+  extern const Arch Arch_mips;
+  /** \relates Arch */
+  extern const Arch Arch_mipsel;
+  /** \relates Arch */
+  extern const Arch Arch_mips64;
+  /** \relates Arch */
+  extern const Arch Arch_mips64el;
   //@}
 
   ///////////////////////////////////////////////////////////////////

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index f25ee0e..961ace3 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -484,12 +484,10 @@ SATResolver::solving(const CapabilitySet & requires_caps,
     solver_set_flag(_solv, SOLVER_FLAG_SPLITPROVIDES, _dosplitprovides);
     solver_set_flag(_solv, SOLVER_FLAG_NO_UPDATEPROVIDE, _noupdateprovide);
     solver_set_flag(_solv, SOLVER_FLAG_IGNORE_RECOMMENDED, _onlyRequires);
-    DBG << "main.cc: " << _dup_allowdowngrade << " / " << solver_get_flag(_solv, SOLVER_FLAG_DUP_ALLOW_DOWNGRADE ) << endl;
     solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_DOWNGRADE,    _dup_allowdowngrade );
     solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE,   _dup_allownamechange );
     solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE, _dup_allowarchchange );
     solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_NAMECHANGE,   _dup_allowvendorchange );
-    DBG << "main.cc: " << _dup_allowdowngrade << " / " << solver_get_flag(_solv, SOLVER_FLAG_DUP_ALLOW_DOWNGRADE ) << endl;
 #if 1
 #define HACKENV(X,D) solver_set_flag(_solv, X, env::HACKENV( #X, D ) );
     HACKENV( SOLVER_FLAG_DUP_ALLOW_DOWNGRADE,  _dup_allowdowngrade );

diff --git a/zypp/url/UrlUtils.h b/zypp/url/UrlUtils.h
index 5189a57..69bc679 100644 (file)
--- a/zypp/url/UrlUtils.h
+++ b/zypp/url/UrlUtils.h
@@ -19,7 +19,7 @@
 #include <map>
 
 /** Characters that are safe for URL without percent-encoding. */
-#define URL_SAFE_CHARS ":/?#[]@!$&'()*+,;="
+#define URL_SAFE_CHARS ":/?#[]@!$&'(){}*+,;="
 
 //////////////////////////////////////////////////////////////////////
 namespace zypp