Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-registration -> sle12 ## BNC# 869088 : "SCC registration: deselected repo is also enabled" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-03-31 17:23:04.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-04-01 11:36:59.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 1 08:25:30 UTC 2014 - lslezak@suse.cz + +- do not restore the original repository status (enabled/disabled + Updates), keep the user changes in installed system (bnc#869088) +- 3.1.26 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:35302 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.25.tar.bz2 New: ---- yast2-registration-3.1.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.npbHaH/_old 2014-04-01 12:47:35.000000000 +0200 +++ /var/tmp/diff_new_pack.npbHaH/_new 2014-04-01 12:47:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.25 +Version: 3.1.26 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.25.tar.bz2 -> yast2-registration-3.1.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/package/yast2-registration.changes new/yast2-registration-3.1.26/package/yast2-registration.changes --- old/yast2-registration-3.1.25/package/yast2-registration.changes 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/package/yast2-registration.changes 2014-04-01 11:33:23.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 1 08:25:30 UTC 2014 - lslezak@suse.cz + +- do not restore the original repository status (enabled/disabled + Updates), keep the user changes in installed system (bnc#869088) +- 3.1.26 + +------------------------------------------------------------------- Mon Mar 31 13:46:00 UTC 2014 - lslezak@suse.cz - fixes/enhancements: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/package/yast2-registration.spec new/yast2-registration-3.1.26/package/yast2-registration.spec --- old/yast2-registration-3.1.25/package/yast2-registration.spec 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/package/yast2-registration.spec 2014-04-01 11:33:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.25 +Version: 3.1.26 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/src/Makefile.am new/yast2-registration-3.1.26/src/Makefile.am --- old/yast2-registration-3.1.25/src/Makefile.am 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/src/Makefile.am 2014-04-01 11:33:23.000000000 +0200 @@ -4,8 +4,7 @@ clients/discover_registration_services.rb \ clients/inst_scc.rb \ clients/scc.rb \ - clients/scc_auto.rb \ - clients/scc_finish.rb + clients/scc_auto.rb desktop_DATA = \ desktop/customer_center.desktop @@ -16,7 +15,6 @@ lib/registration/exceptions.rb \ lib/registration/sw_mgmt.rb \ lib/registration/storage.rb \ - lib/registration/repo_state.rb \ lib/registration/registration.rb \ lib/registration/helpers.rb \ lib/registration/scc_helpers.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/src/clients/inst_scc.rb new/yast2-registration-3.1.26/src/clients/inst_scc.rb --- old/yast2-registration-3.1.25/src/clients/inst_scc.rb 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/src/clients/inst_scc.rb 2014-04-01 11:33:23.000000000 +0200 @@ -217,10 +217,6 @@ enabled = selected_items.include?(repo["SrcId"]) if repo["enabled"] != enabled - # remember the original state - repo_state = ::Registration::RepoState.new(repo["SrcId"], repo["enabled"]) - ::Registration::RepoStateStorage.instance.repositories << repo_state - log.info "Changing repository state: #{repo["name"]} enabled: #{enabled}" Pkg.SourceSetEnabled(repo_id, enabled) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/src/clients/scc_finish.rb new/yast2-registration-3.1.26/src/clients/scc_finish.rb --- old/yast2-registration-3.1.25/src/clients/scc_finish.rb 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/src/clients/scc_finish.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -# encoding: utf-8 - -# ------------------------------------------------------------------------------ -# Copyright (c) 2013 Novell, Inc. All Rights Reserved. -# -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of version 2 of the GNU General Public License as published by the -# Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, you may find -# current contact information at www.novell.com. -# ------------------------------------------------------------------------------ -# -# client for setting the original repository states -# - -require "yast" - -require "registration/repo_state" - -module Yast - class SccFinishClient < Client - include Yast::Logger - - def main - Yast.import "Pkg" - - textdomain "registration" - - func = WFM.Args.first - raise "#{File.basename(__FILE__)}: missing parameter" unless func - - log.info "starting #{__FILE__} (func: #{func})" - - if func == "Info" - return { - "steps" => 1, - # progress step title - "title" => _("Setting original repository configuration..."), - "when" => ::Registration::RepoStateStorage.instance.repositories.empty? ? - [] : [:installation, :live_installation, :update, :autoinst] - } - elsif func == "Write" - # nothing to write - changed_repos = ::Registration::RepoStateStorage.instance.repositories - return nil if changed_repos.empty? - - # activate the original repository states - changed_repos.each(&:restore_state) - - # save all repositories - Pkg.SourceSaveAll - else - raise "#{File.basename(__FILE__)}:unknown parameter: #{func.inspect}" - end - - log.info "#{__FILE__} finished" - end - - end -end - -Yast::SccFinishClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/src/lib/registration/repo_state.rb new/yast2-registration-3.1.26/src/lib/registration/repo_state.rb --- old/yast2-registration-3.1.25/src/lib/registration/repo_state.rb 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/src/lib/registration/repo_state.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -# encoding: utf-8 - -# ------------------------------------------------------------------------------ -# Copyright (c) 2014 Novell, Inc. All Rights Reserved. -# -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of version 2 of the GNU General Public License as published by the -# Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, you may find -# current contact information at www.novell.com. -# ------------------------------------------------------------------------------ -# -# - -require "singleton" - -require "yast" - -module Registration - Yast.import "Pkg" - - # storage for changed repositories - class RepoStateStorage - include Singleton - - attr_accessor :repositories - - def initialize - @repositories = [] - end - end - - # store repository ID and it's original state (enabled/disabled) - class RepoState - include Yast::Logger - - attr_reader :repo_id, :enabled - - def initialize(repo_id, enabled) - @repo_id = repo_id - @enabled = enabled - end - - def restore_state - log.info "Restoring the original repository state: id: #{repo_id}, enabled: #{enabled}" - Yast::Pkg.SourceSetEnabled(repo_id, enabled) - end - end -end - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/test/Makefile.am new/yast2-registration-3.1.26/test/Makefile.am --- old/yast2-registration-3.1.25/test/Makefile.am 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/test/Makefile.am 2014-04-01 11:33:24.000000000 +0200 @@ -2,7 +2,6 @@ addon_spec.rb \ discover_registration_services_test.rb \ helpers_spec.rb \ - scc_finish_test.rb \ sw_mgmt_spec.rb TEST_EXTENSIONS = .rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.25/test/scc_finish_test.rb new/yast2-registration-3.1.26/test/scc_finish_test.rb --- old/yast2-registration-3.1.25/test/scc_finish_test.rb 2014-03-31 16:33:23.000000000 +0200 +++ new/yast2-registration-3.1.26/test/scc_finish_test.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -#! /usr/bin/env rspec - -require_relative "spec_helper" - -require "yast" - -require "registration/repo_state" - -describe "scc_finish client" do - let(:pkg) { double("Yast::Pkg") } - - before do - stub_const("Yast::Pkg", pkg) - end - - context "with Info parameter" do - it "describes the client" do - # check for the hash keys present - expect(Yast::WFM.call("scc_finish", ["Info"])).to include("steps", "title", "when") - end - end - - context "with Write parameter" do - it "restores the original repository states" do - Registration::RepoStateStorage.instance.repositories = [ - Registration::RepoState.new(1, true), - Registration::RepoState.new(2, false) - ] - - expect(pkg).to receive(:SourceSetEnabled).with(1, true) - expect(pkg).to receive(:SourceSetEnabled).with(2, false) - expect(pkg).to receive(:SourceSaveAll) - - expect(Yast::WFM.call("scc_finish", ["Write"])).to be_nil - end - - it "does not do write anything if no repo was changed" do - Registration::RepoStateStorage.instance.repositories = [] - - expect(pkg).to receive(:SourceSetEnabled).never - expect(pkg).to receive(:SourceSaveAll).never - - expect(Yast::WFM.call("scc_finish", ["Write"])).to be_nil - end - end - - context "without any parameter" do - it "the client call returns false" do - # even when there are some changes they are not saved - Registration::RepoStateStorage.instance.repositories = [ - Registration::RepoState.new(1, true), - Registration::RepoState.new(2, false) - ] - - expect(pkg).to receive(:SourceSetEnabled).never - expect(pkg).to receive(:SourceSaveAll).never - - # WFM.call catches all exceptions and returns false - # see https://github.com/yast/yast-ruby-bindings/blob/master/src/ruby/yast/wfm.rb#... - expect(Yast::WFM.call("scc_finish")).to be_false - expect(Yast::WFM.call("scc_finish", [])).to be_false - end - end - - context "with a wrong parameter" do - it "the client call returns false" do - # even when there are some changes they are not saved - Registration::RepoStateStorage.instance.repositories = [ - Registration::RepoState.new(1, true), - Registration::RepoState.new(2, false) - ] - - expect(pkg).to receive(:SourceSetEnabled).never - expect(pkg).to receive(:SourceSaveAll).never - - expect(Yast::WFM.call("scc_finish", ["Invalid_Parameter"])).to be_false - end - end -end continue with "q"... Checked in at Tue Apr 1 12:47:55 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org