Hello community,
here is the log from the commit of package yast2-pkg-bindings for
openSUSE:Factory checked in at 2017-04-12 17:08:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings"
Wed Apr 12 17:08:20 2017 rev:188 rq:483423 version:3.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes
2016-10-18 13:27:42.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes
2017-04-12 17:08:22.129914175 +0200
@@ -1,0 +2,12 @@
+Wed Mar 29 16:35:24 UTC 2017 - lsle...@suse.cz
+
+- Fixed failure when trying to save a plugin service (bsc#1021117)
+- 3.2.2
+
+-------------------------------------------------------------------
+Wed Mar 29 15:29:51 UTC 2017 - lsle...@suse.cz
+
+- Return the repository signature flag status in the
+ Pkg.SourceGeneralData call (might be used for bsc#1009127)
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-3.2.1.tar.bz2
New:
----
yast2-pkg-bindings-3.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.D3sSqG/_old 2017-04-12 17:08:22.825815665 +0200
+++ /var/tmp/diff_new_pack.D3sSqG/_new 2017-04-12 17:08:22.825815665 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-pkg-bindings-devel-doc
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 3.2.1
+Version: 3.2.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-%{version}.tar.bz2
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.D3sSqG/_old 2017-04-12 17:08:22.849812268 +0200
+++ /var/tmp/diff_new_pack.D3sSqG/_new 2017-04-12 17:08:22.853811702 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-pkg-bindings
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 3.2.1
+Version: 3.2.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-pkg-bindings-3.2.1.tar.bz2 -> yast2-pkg-bindings-3.2.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.2.1/.travis.yml
new/yast2-pkg-bindings-3.2.2/.travis.yml
--- old/yast2-pkg-bindings-3.2.1/.travis.yml 2016-10-17 10:44:33.540849663
+0200
+++ new/yast2-pkg-bindings-3.2.2/.travis.yml 2017-03-29 18:42:29.248988637
+0200
@@ -1,15 +1,11 @@
-language: cpp
-compiler:
- - gcc
+sudo: required
+language: bash
+services:
+ - docker
+
before_install:
- # use gcc-4.8 (needed by libzypp) instead of gcc-4.6 default
- - export CC=gcc-4.8
- - export CXX=g++-4.8
- - wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- - sh ./travis_setup.sh -p "yast2-core-dev libzypp-dev yast2-devtools
doxygen yast2-testsuite g++-4.8"
+ - docker build -t yast-pkg-bindings-image .
script:
- - make -f Makefile.cvs
- - make -j 4
- - make check
- - sudo make install
-
+ # the "yast-travis-cpp" script is included in the base yastdevel/cpp image
+ # see https://github.com/yast/docker-yast-cpp/blob/master/yast-travis-cpp
+ - docker run -it yast-pkg-bindings-image yast-travis-cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.2.1/Dockerfile
new/yast2-pkg-bindings-3.2.2/Dockerfile
--- old/yast2-pkg-bindings-3.2.1/Dockerfile 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-pkg-bindings-3.2.2/Dockerfile 2017-03-29 18:42:29.252988637
+0200
@@ -0,0 +1,5 @@
+FROM yastdevel/cpp
+RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \
+ libzypp-devel
+COPY . /usr/src/app
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.2.1/package/yast2-pkg-bindings-devel-doc.spec
new/yast2-pkg-bindings-3.2.2/package/yast2-pkg-bindings-devel-doc.spec
--- old/yast2-pkg-bindings-3.2.1/package/yast2-pkg-bindings-devel-doc.spec
2016-10-17 10:44:33.624849663 +0200
+++ new/yast2-pkg-bindings-3.2.2/package/yast2-pkg-bindings-devel-doc.spec
2017-03-29 18:42:29.252988637 +0200
@@ -16,7 +16,7 @@
#
Name: yast2-pkg-bindings-devel-doc
-Version: 3.2.1
+Version: 3.2.2
Release: 0
License: GPL-2.0
Group: Documentation/HTML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.2.1/package/yast2-pkg-bindings.changes
new/yast2-pkg-bindings-3.2.2/package/yast2-pkg-bindings.changes
--- old/yast2-pkg-bindings-3.2.1/package/yast2-pkg-bindings.changes
2016-10-17 10:44:33.628849663 +0200
+++ new/yast2-pkg-bindings-3.2.2/package/yast2-pkg-bindings.changes
2017-03-29 18:42:29.252988637 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Mar 29 16:35:24 UTC 2017 - lsle...@suse.cz
+
+- Fixed failure when trying to save a plugin service (bsc#1021117)
+- 3.2.2
+
+-------------------------------------------------------------------
+Wed Mar 29 15:29:51 UTC 2017 - lsle...@suse.cz
+
+- Return the repository signature flag status in the
+ Pkg.SourceGeneralData call (might be used for bsc#1009127)
+
+-------------------------------------------------------------------
Wed Oct 12 16:24:12 UTC 2016 - lsle...@suse.cz
- Added Pkg.SourceSetPriority() to allow changing the priority
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-pkg-bindings-3.2.1/package/yast2-pkg-bindings.spec
new/yast2-pkg-bindings-3.2.2/package/yast2-pkg-bindings.spec
--- old/yast2-pkg-bindings-3.2.1/package/yast2-pkg-bindings.spec
2016-10-17 10:44:33.628849663 +0200
+++ new/yast2-pkg-bindings-3.2.2/package/yast2-pkg-bindings.spec
2017-03-29 18:42:29.252988637 +0200
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 3.2.1
+Version: 3.2.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.2.1/src/Service.cc
new/yast2-pkg-bindings-3.2.2/src/Service.cc
--- old/yast2-pkg-bindings-3.2.1/src/Service.cc 2016-10-07 10:48:46.088670299
+0200
+++ new/yast2-pkg-bindings-3.2.2/src/Service.cc 2017-03-29 18:42:29.264988637
+0200
@@ -167,7 +167,11 @@
@builtin ServiceGet
@short Get detailed properties of a service
@param alias alias of the service
- @return map Service data in map $[ "alias":string, "name":string,
"url":string, "autorefresh":boolean, "enabled":boolean, "file":string,
"repos_to_disable" : list<string>, "repos_to_enable" : list<string> ]. "file"
is name of the file from which the service has been read, it is empty if the
service has not been saved yet
+ @return map Service data in map $[ "alias":string, "name":string,
"url":string,
+ "autorefresh":boolean, "enabled":boolean, "file":string, "type":string,
+ "repos_to_disable" : list<string>, "repos_to_enable" : list<string> ].
"file"
+ is name of the file from which the service has been read, it is empty if the
+ service has not been saved yet
*/
YCPValue PkgFunctions::ServiceGet(const YCPString &alias)
{
@@ -186,6 +190,7 @@
ret->add(YCPString("autorefresh"), YCPBoolean(s.autorefresh()));
ret->add(YCPString("enabled"), YCPBoolean(s.enabled()));
ret->add(YCPString("file"), YCPString(s.filepath().asString()));
+ ret->add(YCPString("type"), YCPString(s.type().asString()));
if (s.reposToDisableSize() > 0)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.2.1/src/ServiceManager.cc
new/yast2-pkg-bindings-3.2.2/src/ServiceManager.cc
--- old/yast2-pkg-bindings-3.2.1/src/ServiceManager.cc 2016-10-07
10:48:46.092670299 +0200
+++ new/yast2-pkg-bindings-3.2.2/src/ServiceManager.cc 2017-03-29
18:42:29.264988637 +0200
@@ -309,12 +309,19 @@
{
const std::string alias(s_known.alias());
const zypp::ServiceInfo s_stored = repomgr.getService(alias);
+ const std::string orig_alias(s_known.origAlias());
+
+ // plugin services cannot be saved, they are provided by a script
+ // https://doc.opensuse.org/projects/libzypp/SLE12SP1/zypp-services.html
+ if (s_stored.type() == zypp::repo::ServiceType::PLUGIN)
+ {
+ y2milestone("Not saving a plugin service: %s", orig_alias.c_str());
+ return;
+ }
DBG << "Known Service: " << s_known << std::endl;
DBG << "Stored Service: " << s_stored << std::endl;
- std::string orig_alias(s_known.origAlias());
-
y2debug("orig_alias: %s", orig_alias.c_str());
// already saved?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-3.2.1/src/Source_Get.cc
new/yast2-pkg-bindings-3.2.2/src/Source_Get.cc
--- old/yast2-pkg-bindings-3.2.1/src/Source_Get.cc 2016-10-07
10:48:46.136670299 +0200
+++ new/yast2-pkg-bindings-3.2.2/src/Source_Get.cc 2017-03-29
18:42:29.268988637 +0200
@@ -32,6 +32,7 @@
#include <zypp/Product.h>
#include <zypp/Repository.h>
#include <zypp/media/CredentialManager.h>
+#include <zypp/TriBool.h>
#include <ycp/YCPBoolean.h>
#include <ycp/YCPMap.h>
@@ -115,6 +116,7 @@
* "service" : YCPString, (service to which the repo belongs, empty if there
is no service assigned)
* "keeppackages" : YCPBoolean,
* "is_update_repo" : YCPBoolean, (true if this is an update repo - this
requires loaded objects in pool otherwise the flag is not returned! The value
is stored in repo metadata, not in .repo file!)
+ * "valid_repo_signature" : YCPBoolean or YCPVoid (boolean: nil=unsigned,
false=bad signature, true=good signature)
* ];
*
* </code>
@@ -163,6 +165,12 @@
data->add( YCPString("keeppackages"),
YCPBoolean(repo->repoInfo().keepPackages()));
+ // handle tribool, return nil for the indeterminate state
+ if (zypp::indeterminate(repo->repoInfo().validRepoSignature()))
+ data->add(YCPString("valid_repo_signature"), YCPVoid());
+ else
+ data->add(YCPString("valid_repo_signature"),
(YCPBoolean(repo->repoInfo().validRepoSignature())));
+
// add Repository data
zypp::Repository
repository(zypp::ResPool::instance().reposFind(repo->repoInfo().alias()));
