Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory checked
in at 2014-12-16 14:50:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp (Old)
and /work/SRC/openSUSE:Factory/.libzypp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2014-12-09
09:13:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2014-12-16
14:51:09.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 10 16:06:04 CET 2014 - m...@suse.de
+
+- suppress informal license (no need to accept) upon update (bnc#908976)
+- version 14.32.0 (30)
+
+-------------------------------------------------------------------
Old:
----
libzypp-14.31.0.tar.bz2
New:
----
libzypp-14.32.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.6Vj61Z/_old 2014-12-16 14:51:11.000000000 +0100
+++ /var/tmp/diff_new_pack.6Vj61Z/_new 2014-12-16 14:51:11.000000000 +0100
@@ -19,7 +19,7 @@
%define force_gcc_46 0
Name: libzypp
-Version: 14.31.0
+Version: 14.32.0
Release: 0
Url: git://gitorious.org/opensuse/libzypp.git
Summary: Package, Patch, Pattern, and Product Management
++++++ libzypp-14.31.0.tar.bz2 -> libzypp-14.32.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.31.0/VERSION.cmake
new/libzypp-14.32.0/VERSION.cmake
--- old/libzypp-14.31.0/VERSION.cmake 2014-12-08 14:56:41.000000000 +0100
+++ new/libzypp-14.32.0/VERSION.cmake 2014-12-10 16:09:01.000000000 +0100
@@ -60,9 +60,9 @@
#
SET(LIBZYPP_MAJOR "14")
SET(LIBZYPP_COMPATMINOR "30")
-SET(LIBZYPP_MINOR "31")
+SET(LIBZYPP_MINOR "32")
SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 14.31.0 (30)
+# LAST RELEASED: 14.32.0 (30)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.31.0/package/libzypp.changes
new/libzypp-14.32.0/package/libzypp.changes
--- old/libzypp-14.31.0/package/libzypp.changes 2014-12-08 14:56:41.000000000
+0100
+++ new/libzypp-14.32.0/package/libzypp.changes 2014-12-10 16:09:01.000000000
+0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Dec 10 16:06:04 CET 2014 - m...@suse.de
+
+- suppress informal license (no need to accept) upon update (bnc#908976)
+- version 14.32.0 (30)
+
+-------------------------------------------------------------------
Mon Dec 8 14:53:00 CET 2014 - m...@suse.de
- Adapt to gpg-2.1 (bnc#908135)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.31.0/zypp/RepoInfo.cc
new/libzypp-14.32.0/zypp/RepoInfo.cc
--- old/libzypp-14.31.0/zypp/RepoInfo.cc 2014-10-17 10:28:41.000000000
+0200
+++ new/libzypp-14.32.0/zypp/RepoInfo.cc 2014-12-10 16:09:01.000000000
+0100
@@ -356,6 +356,9 @@
}
std::string RepoInfo::getLicense( const Locale & lang_r )
+ { return const_cast<const RepoInfo *>(this)->getLicense( lang_r ); }
+
+ std::string RepoInfo::getLicense( const Locale & lang_r ) const
{
LocaleSet avlocales( getLicenseLocales() );
if ( avlocales.empty() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.31.0/zypp/RepoInfo.h
new/libzypp-14.32.0/zypp/RepoInfo.h
--- old/libzypp-14.31.0/zypp/RepoInfo.h 2014-10-15 15:12:42.000000000 +0200
+++ new/libzypp-14.32.0/zypp/RepoInfo.h 2014-12-10 16:09:01.000000000 +0100
@@ -348,7 +348,8 @@
bool needToAcceptLicense() const;
/** Return the best license for the current (or a specified) locale. */
- std::string getLicense( const Locale & lang_r = Locale() );
+ std::string getLicense( const Locale & lang_r = Locale() ) const;
+ std::string getLicense( const Locale & lang_r = Locale() ); // LEGACY API
/** Return the locales the license is available for.
* \ref Locale::noCode is included in case of \c license.txt which does
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-14.31.0/zypp/ResObject.cc
new/libzypp-14.32.0/zypp/ResObject.cc
--- old/libzypp-14.31.0/zypp/ResObject.cc 2014-07-01 11:30:28.000000000
+0200
+++ new/libzypp-14.32.0/zypp/ResObject.cc 2014-12-10 16:09:01.000000000
+0100
@@ -17,6 +17,8 @@
#include "zypp/RepoInfo.h"
#include "zypp/IdString.h"
+#include "zypp/ui/Selectable.h"
+
using namespace zypp;
using namespace std;
@@ -71,7 +73,11 @@
{
std::string ret = lookupStrAttribute( sat::SolvAttr::eula, lang_r );
if ( ret.empty() && isKind<Product>() )
- return repoInfo().getLicense( lang_r );
+ {
+ const RepoInfo & ri( repoInfo() );
+ if ( ri.needToAcceptLicense() || ! ui::Selectable::get( *this
)->hasInstalledObj() )
+ ret = ri.getLicense( lang_r ); // bnc#908976: suppress informal license
upon update
+ }
return ret;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
