Hello community, here is the log from the commit of package SUSEConnect for openSUSE:Factory checked in at 2019-04-21 09:01:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SUSEConnect (Old) and /work/SRC/openSUSE:Factory/.SUSEConnect.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SUSEConnect" Sun Apr 21 09:01:06 2019 rev:18 rq:695188 version:0.3.17 Changes: -------- --- /work/SRC/openSUSE:Factory/SUSEConnect/SUSEConnect.changes 2019-02-08 12:02:26.969724280 +0100 +++ /work/SRC/openSUSE:Factory/.SUSEConnect.new.5536/SUSEConnect.changes 2019-04-21 09:01:12.490396332 +0200 @@ -1,0 +2,7 @@ +Tue Apr 2 12:33:41 UTC 2019 - Ivan Kapelyukhin <[email protected]> + +- Update to 0.3.17 + - Don't try to remove a service during migration if a zypper service + plugin already exists (bsc#1128969) + +------------------------------------------------------------------- Old: ---- suse-connect-0.3.16.gem New: ---- suse-connect-0.3.17.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SUSEConnect.spec ++++++ --- /var/tmp/diff_new_pack.ghtcuA/_old 2019-04-21 09:01:13.098397053 +0200 +++ /var/tmp/diff_new_pack.ghtcuA/_new 2019-04-21 09:01:13.098397053 +0200 @@ -17,7 +17,7 @@ Name: SUSEConnect -Version: 0.3.16 +Version: 0.3.17 Release: 0 %define mod_name suse-connect %define mod_full_name %{mod_name}-%{version} ++++++ SUSEConnect.5 ++++++ --- /var/tmp/diff_new_pack.ghtcuA/_old 2019-04-21 09:01:13.134397096 +0200 +++ /var/tmp/diff_new_pack.ghtcuA/_new 2019-04-21 09:01:13.134397096 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "SUSECONNECT" "5" "November 2018" "" "SUSEConnect" +.TH "SUSECONNECT" "5" "February 2017" "" "SUSEConnect" . .SH "NAME" \fBSUSEConnect\fR \- SUSE Customer Center registration tool config file ++++++ SUSEConnect.8 ++++++ --- /var/tmp/diff_new_pack.ghtcuA/_old 2019-04-21 09:01:13.162397130 +0200 +++ /var/tmp/diff_new_pack.ghtcuA/_new 2019-04-21 09:01:13.166397135 +0200 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "SUSECONNECT" "8" "November 2018" "" "SUSEConnect" +.TH "SUSECONNECT" "8" "May 2017" "" "SUSEConnect" . .SH "NAME" \fBSUSEConnect\fR \- SUSE Customer Center registration tool ++++++ suse-connect-0.3.16.gem -> suse-connect-0.3.17.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bin/SUSEConnect new/bin/SUSEConnect --- old/bin/SUSEConnect 2018-12-07 12:50:58.000000000 +0100 +++ new/bin/SUSEConnect 2019-04-12 12:19:12.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib') require 'suse/connect/cli' Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/migration.rb new/lib/suse/connect/migration.rb --- old/lib/suse/connect/migration.rb 2018-12-07 12:50:58.000000000 +0100 +++ new/lib/suse/connect/migration.rb 2019-04-12 12:19:12.000000000 +0200 @@ -74,13 +74,19 @@ # @param [String] service_url the url from the service to add # @param [String] service_name the name of the service to add def add_service(service_url, service_name) - SUSE::Connect::Zypper.add_service(service_url, service_name) + # don't try to add the service if the plugin with the same name exists (bsc#1128969) + unless File.exist?("/usr/lib/zypp/plugins/services/#{service_name}") + SUSE::Connect::Zypper.add_service(service_url, service_name) + end end # Forwards the service names which should be removed with zypper # @param [String] service_name the name of the service to remove def remove_service(service_name) - SUSE::Connect::Zypper.remove_service(service_name) + # don't try to remove the service if the plugin with the same name exists (bsc#1128969) + unless File.exist?("/usr/lib/zypp/plugins/services/#{service_name}") + SUSE::Connect::Zypper.remove_service(service_name) + end end # Finds the solvable products available on the system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/suse/connect/version.rb new/lib/suse/connect/version.rb --- old/lib/suse/connect/version.rb 2018-12-07 12:50:58.000000000 +0100 +++ new/lib/suse/connect/version.rb 2019-04-12 12:19:12.000000000 +0200 @@ -1,5 +1,5 @@ module SUSE module Connect - VERSION = '0.3.16' + VERSION = '0.3.17' end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2018-12-07 12:50:58.000000000 +0100 +++ new/metadata 2019-04-12 12:19:12.000000000 +0200 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: suse-connect version: !ruby/object:Gem::Version - version: 0.3.16 + version: 0.3.17 platform: ruby authors: - SUSE Customer Center Team autorequire: bindir: bin cert_chain: [] -date: 2018-12-07 00:00:00.000000000 Z +date: 2019-04-12 00:00:00.000000000 Z dependencies: [] description: This package provides a command line tool and rubygem library for connecting a client system to the SUSE Customer Center. It will connect the system to your
