-------------------------------------------------------------------
+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)
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.
*/
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
*/
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.