Imported Upstream version 15.6.0

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

diff --git a/VERSION.cmake b/VERSION.cmake
index 4c008b2..322599a 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "15")
 SET(LIBZYPP_COMPATMINOR "5")
-SET(LIBZYPP_MINOR "5")
+SET(LIBZYPP_MINOR "6")
 SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 15.5.0 (5)
+# LAST RELEASED: 15.6.0 (5)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 22e5a72..12839da 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Jun 29 17:43:00 CEST 2015 - ma@suse.de
+
+- Fix lost pathname when importing repo keys (bnc#936373)
+- Disable code swig does not understand
+- version 15.6.0 (5)
+
+-------------------------------------------------------------------
 Sat Jun 27 17:07:32 CEST 2015 - ma@suse.de
 
 - Patch: fixup testing Category and Severity flags (FATE#318760)

diff --git a/zypp/Patch.h b/zypp/Patch.h
index 8025878..74e1bc0 100644 (file)
--- a/zypp/Patch.h
+++ b/zypp/Patch.h
@@ -106,15 +106,18 @@ namespace zypp
       bool isCategory( const std::string & category_r ) const;
       /** \overload taking OR'ed \ref Categories */
       bool isCategory( Categories category_r ) const;
-      /** \overload taking container of category strings */
-      template <class _Container>
+#ifndef SWIG // Swig treats it as syntax error
+      /** \overload taking container of category strings
+       * 2nd template arg just to prevent instantiation for Category
+       */
+      template <class _Container, typename = typename _Container::value_type>
       bool isCategory( const _Container & categories_r ) const
       {
        for ( const std::string & el : categories_r )
        { if ( isCategory( el ) ) return true; }
        return false;
       }
-
+#endif
       /** Patch category as enum of wellknown categories.
        * Unknown values are mapped to \ref CAT_OTHER.
        */
@@ -139,15 +142,18 @@ namespace zypp
       bool isSeverity( const std::string & severity_r ) const;
       /** \overload taking OR'ed \ref SeverityFlags */
       bool isSeverity( SeverityFlags severity_r ) const;
-      /** \overload taking container of severity strings */
-      template <class _Container>
+#ifndef SWIG // Swig treats it as syntax error
+      /** \overload taking container of severity strings
+       * 2nd template arg just to prevent instantiation for SeverityFlag
+       */
+      template <class _Container, typename = typename _Container::value_type>
       bool isSeverity( const _Container & severities_r ) const
       {
        for ( const std::string & el : severities_r )
        { if ( isSeverity( el ) ) return true; }
        return false;
       }
-
+#endif
       /** Severity string mapped to an enum.
        * Unknown string values are mapped to \ref SEV_OTHER
        */

diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc
index ccbfcf0..fe8889b 100644 (file)
--- a/zypp/target/rpm/RpmDb.cc
+++ b/zypp/target/rpm/RpmDb.cc
@@ -1108,7 +1108,8 @@ void RpmDb::importPubkey( const PublicKey & pubkey_r )
   RpmArgVec opts;
   opts.push_back ( "--import" );
   opts.push_back ( "--" );
-  opts.push_back ( pubkey_r.path().asString().c_str() );
+  std::string pubkeypath( pubkey_r.path().asString() );
+  opts.push_back ( pubkeypath.c_str() );
 
   // don't call modifyDatabase because it would remove the old
   // rpm3 database, if the current database is a temporary one.