[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
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# 888158 : "Replace "Email" with "E-mail address"" (NEW/) ## BNC# 886804 : "[Upgrade] SLP discovery not called during upgrading from sled11sp3 to sled12" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-07-23 16:46:31.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-07-25 15:04:47.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 25 12:36:39 UTC 2014 - lslezak@suse.cz + +- another "E-mail Address" label fixes (bnc#888158) +- 3.1.93 + +------------------------------------------------------------------- +Thu Jul 24 20:17:31 UTC 2014 - lslezak@suse.cz + +- call SLP discovery at upgrade when the system was not registered + at NCC (bnc#886804) +- 3.1.92 + +------------------------------------------------------------------- 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:41827 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.91.tar.bz2 New: ---- yast2-registration-3.1.93.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.qH81h9/_old 2014-07-25 16:01:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qH81h9/_new 2014-07-25 16:01:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.91 +Version: 3.1.93 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.91.tar.bz2 -> yast2-registration-3.1.93.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/package/yast2-registration.changes new/yast2-registration-3.1.93/package/yast2-registration.changes --- old/yast2-registration-3.1.91/package/yast2-registration.changes 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/package/yast2-registration.changes 2014-07-25 15:01:28.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Jul 25 12:36:39 UTC 2014 - lslezak@suse.cz + +- another "E-mail Address" label fixes (bnc#888158) +- 3.1.93 + +------------------------------------------------------------------- +Thu Jul 24 20:17:31 UTC 2014 - lslezak@suse.cz + +- call SLP discovery at upgrade when the system was not registered + at NCC (bnc#886804) +- 3.1.92 + +------------------------------------------------------------------- Tue Jul 22 15:45:44 UTC 2014 - lslezak@suse.cz - do not cache the base product upgrade, always do the upgrade diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/package/yast2-registration.spec new/yast2-registration-3.1.93/package/yast2-registration.spec --- old/yast2-registration-3.1.91/package/yast2-registration.spec 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/package/yast2-registration.spec 2014-07-25 15:01:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.91 +Version: 3.1.93 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/src/clients/scc_auto.rb new/yast2-registration-3.1.93/src/clients/scc_auto.rb --- old/yast2-registration-3.1.91/src/clients/scc_auto.rb 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/src/clients/scc_auto.rb 2014-07-25 15:01:28.000000000 +0200 @@ -374,7 +374,7 @@ # Translators: Text for UI Label - capitalized Frame(_("Registration"), VBox( - MinWidth(32, InputField(Id(:email), _("&Email"), @config.email)), + MinWidth(32, InputField(Id(:email), _("&E-mail Address"), @config.email)), VSpacing(0.4), MinWidth(32, InputField(Id(:reg_code), _("Registration &Code"), @config.reg_code)), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/src/data/registration/autoyast_summary.erb new/yast2-registration-3.1.93/src/data/registration/autoyast_summary.erb --- old/yast2-registration-3.1.91/src/data/registration/autoyast_summary.erb 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/src/data/registration/autoyast_summary.erb 2014-07-25 15:01:28.000000000 +0200 @@ -14,7 +14,7 @@ <% if @config.do_registration %> <h3><%= _("Registration Settings") %></h3> <ul> - <li><%= _("Email: %s") % h(@config.email) %></li> + <li><%= _("E-mail Address: %s") % h(@config.email) %></li> <% if !@config.reg_code.empty? %> <li><%= _("Registration Code is Configured") %></li> <% end %> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/src/lib/registration/connect_helpers.rb new/yast2-registration-3.1.93/src/lib/registration/connect_helpers.rb --- old/yast2-registration-3.1.91/src/lib/registration/connect_helpers.rb 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/src/lib/registration/connect_helpers.rb 2014-07-25 15:01:28.000000000 +0200 @@ -104,11 +104,11 @@ e.message << "\n\n\n" + msg report_error(message_prefix + _("Registration failed."), e) else - report_error(message_prefix + _("The email address is not known or\nthe registration code is not valid."), e) + report_error(message_prefix + _("The e-mail address is not known or\nthe registration code is not valid."), e) end when 422 # Error popup - report_error(message_prefix + _("The email address is not known or\nthe registration code is not valid."), e) + report_error(message_prefix + _("The e-mail address is not known or\nthe registration code is not valid."), e) when 400..499 report_error(message_prefix + _("Registration client error."), e) when 500..599 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/src/lib/registration/helpers.rb new/yast2-registration-3.1.93/src/lib/registration/helpers.rb --- old/yast2-registration-3.1.91/src/lib/registration/helpers.rb 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/src/lib/registration/helpers.rb 2014-07-25 15:01:28.000000000 +0200 @@ -174,13 +174,20 @@ boot_url = boot_reg_url return boot_url if boot_url - # FIXME check at first new suseconnect conf - old_conf = SuseRegister.new(Yast::Installation.destdir) - if old_conf.found? - # use default if ncc was used in past - return nil if old_conf.ncc? - # if specific server is used, then also use it - return old_conf.stripped_url.to_s + # check for suse_register config only when NCC credentials file exists + # (the config file exists even on a not registered system) + dir = SUSE::Connect::Credentials::DEFAULT_CREDENTIALS_DIR + ncc_creds = File.join(Yast::Installation.destdir, dir, "NCCcredentials") + if File.exist?(ncc_creds) + # FIXME check at first new suseconnect conf + old_conf = SuseRegister.new(Yast::Installation.destdir) + + if old_conf.found? + # use default if ncc was used in past + return nil if old_conf.ncc? + # if specific server is used, then also use it + return old_conf.stripped_url.to_s + end end # try SLP if not registered diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/src/lib/registration/sw_mgmt.rb new/yast2-registration-3.1.93/src/lib/registration/sw_mgmt.rb --- old/yast2-registration-3.1.91/src/lib/registration/sw_mgmt.rb 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/src/lib/registration/sw_mgmt.rb 2014-07-25 15:01:28.000000000 +0200 @@ -288,19 +288,24 @@ end def self.find_addon_updates(addons) + log.info "Available addons: #{addons.map(&:identifier)}" + products = Pkg.ResolvableProperties("", :product, "") installed_addons = products.select do |product| product["status"] == :installed && product["type"] != "base" end + product_names = installed_addons.map{|a| "#{a["name"]}-#{a["version"]}-#{a["release"]}"} + log.info "Installed addons: #{product_names}" + ret = addons.select do |addon| installed_addons.any? do |installed_addon| addon.updates_addon?(installed_addon) end end - log.info "Found addons to update: #{ret}" + log.info "Found addons to update: #{ret.map(&:identifier)}" ret end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.91/test/helpers_spec.rb new/yast2-registration-3.1.93/test/helpers_spec.rb --- old/yast2-registration-3.1.91/test/helpers_spec.rb 2014-07-23 13:08:50.000000000 +0200 +++ new/yast2-registration-3.1.93/test/helpers_spec.rb 2014-07-25 15:01:29.000000000 +0200 @@ -86,6 +86,73 @@ expect(Registration::Helpers.registration_url).to eq(url) end end + + context "at upgrade" do + let(:yast_installation) { double("Yast::Instrallation") } + let(:suse_register) { "/mnt/etc/suseRegister.conf" } + + before do + allow(yast_mode).to receive(:mode).and_return("update") + allow(yast_wfm).to receive(:call).with("discover_registration_services").and_return(nil) + + stub_const("Yast::Installation", yast_installation) + allow(yast_installation).to receive(:destdir).and_return("/mnt") + end + + it "returns 'regurl' boot parameter from Linuxrc" do + url = "https://example.com/register" + expect(yast_linuxrc).to receive(:InstallInf).with("regurl").and_return(url) + # make sure no SLP discovery is executed, the boot parameter has higher priority + expect(yast_wfm).to receive(:call).with("discover_registration_services").never + expect(Registration::Helpers.registration_url).to eq(url) + end + + context "the system has been already registered" do + before do + expect(File).to receive(:exist?).with("/mnt/etc/zypp/credentials.d/NCCcredentials").and_return(true) + expect(yast_linuxrc).to receive(:InstallInf).with("regurl").and_return(nil) + end + + it "return default when NCC registration server was used" do + expect(File).to receive(:exist?).with(suse_register).and_return(true) + expect(File).to receive(:readlines).with(suse_register).\ + and_return(File.readlines(fixtures_file("old_conf_ncc/etc/suseRegister.conf"))) + + expect(Registration::Helpers.registration_url).to be_nil + end + + it "return URL of SMT server when used" do + expect(File).to receive(:exist?).with(suse_register).and_return(true) + expect(File).to receive(:readlines).with(suse_register).\ + and_return(File.readlines(fixtures_file("old_conf_custom/etc/suseRegister.conf"))) + + expect(Registration::Helpers.registration_url).to eq("https://myserver.com") + end + end + + context "the system has not been registered" do + before do + expect(File).to receive(:exist?).with("/mnt/etc/zypp/credentials.d/NCCcredentials").and_return(false) + expect(yast_linuxrc).to receive(:InstallInf).with("regurl").and_return(nil) + end + + it "calls SLP discovery" do + slp_url = "https://slp.example.com/register" + expect(yast_wfm).to receive(:call).with("discover_registration_services").and_return(slp_url) + expect(Registration::Helpers.registration_url).to eq(slp_url) + end + end + end + + context "at unknown mode" do + before do + allow(yast_mode).to receive(:mode).and_return("config") + end + + it "returns nil (default URL)" do + expect(Registration::Helpers.registration_url).to be_nil + end + end end describe ".service_url" do continue with "q"... Checked in at Fri Jul 25 16:01:41 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
participants (1)
-
ro