SET(LIBZYPP_MAJOR "15")
SET(LIBZYPP_COMPATMINOR "19")
SET(LIBZYPP_MINOR "19")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "4")
#
-# LAST RELEASED: 15.19.3 (19)
+# LAST RELEASED: 15.19.4 (19)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
%endif
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
-unset TRANSLATION_SET
unset EXTRA_CMAKE_OPTIONS
-# Same codebase, but SLES may use it's own translation set.
-# suse_version
-# 1110 SLES11
-# 1315-1319 SLES12
-%if 0%{?suse_version} == 1110 || ( 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1319 )
+# We are moving towards a uniform translation set for SLE and openSUSE.
+# While separate SLE translations are still present, overlay them.
+unset TRANSLATION_SET
if [ -f ../po/sle-zypp-po.tar.bz2 ]; then
export TRANSLATION_SET=sle-zypp
fi
-%endif
# No libproxy on SLE11
%if 0%{?suse_version} == 1110
export EXTRA_CMAKE_OPTIONS="-DDISABLE_LIBPROXY=ON"
-------------------------------------------------------------------
+Thu Oct 22 12:23:29 CEST 2015 - ma@suse.de
+
+- Use a uniform translation set for SLE and openSUSE (bnc#948924)
+- fix Plugin-services not updating repo GPGCheck settings (bnc#951402)
+- version 15.19.4 (19)
+
+-------------------------------------------------------------------
+Sun Oct 18 01:13:27 CEST 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Oct 15 01:13:57 CEST 2015 - ma@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
Wed Oct 14 16:36:27 CEST 2015 - ma@suse.de
- make Solvable::asUserString more readable (bnc#949957)
void RepoInfo::setPkgGpgCheck( TriBool value_r )
{ _pimpl->_pkgGpgCheck = value_r; }
+ void RepoInfo::getRawGpgChecks( TriBool & g_r, TriBool & r_r, TriBool & p_r ) const
+ {
+ g_r = _pimpl->_gpgCheck;
+ r_r = _pimpl->_repoGpgCheck;
+ p_r = _pimpl->_pkgGpgCheck;
+ }
TriBool RepoInfo::validRepoSignature() const
{
class Impl;
private:
+ friend class RepoManager;
+ /** Raw values for RepoManager */
+ void getRawGpgChecks( TriBool & g_r, TriBool & r_r, TriBool & p_r ) const;
+
/** Pointer to implementation */
RWCOW_pointer<Impl> _pimpl;
};
oldRepoModified = true;
}
+ // changed gpg check settings?
+ // ATM only plugin services can set GPG values.
+ if ( service.type() == ServiceType::PLUGIN )
+ {
+ TriBool ogpg[3]; // Gpg RepoGpg PkgGpg
+ TriBool ngpg[3];
+ oldRepo->getRawGpgChecks( ogpg[0], ogpg[1], ogpg[2] );
+ it-> getRawGpgChecks( ngpg[0], ngpg[1], ngpg[2] );
+#define Z_CHKGPG(I,N) \
+ if ( ! sameTriboolState( ogpg[I], ngpg[I] ) ) \
+ { \
+ DBG << "Service repo " << it->alias() << " gets new "#N"Check " << ngpg[I] << endl; \
+ oldRepo->set##N##Check( ngpg[I] ); \
+ oldRepoModified = true; \
+ }
+ Z_CHKGPG( 0, Gpg );
+ Z_CHKGPG( 1, RepoGpg );
+ Z_CHKGPG( 2, PkgGpg );
+#undef Z_CHKGPG
+ }
+
// save if modified:
if ( oldRepoModified )
{
/** \relates TriBool stream output */
inline std::ostream & operator<<(std::ostream & s, const tribool & obj)
{ return s << zypp::asString( obj ); }
+
+ /** \relates TriBool whether 2 tribool have the same state (this is NOT ==) */
+ inline bool sameTriboolState( tribool lhs, tribool rhs )
+ { return( ( indeterminate(lhs) && indeterminate(rhs) ) || ( lhs == rhs ) ); }
}
}
#endif // ZYPP_TRIBOOL_H