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 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-04-10 17:28:39.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-04-11 17:01:52.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 11 12:14:04 UTC 2014 - lslezak@suse.cz + +- use generic SLP service name for both SMT and SUSE Manager + (fate#316384) +- fixed namespace error when reading SLP service URL +- 3.1.32 + +------------------------------------------------------------------- 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:36175 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.31.tar.bz2 New: ---- yast2-registration-3.1.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.uU5Ufc/_old 2014-04-14 11:36:16.000000000 +0200 +++ /var/tmp/diff_new_pack.uU5Ufc/_new 2014-04-14 11:36:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.31 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.31.tar.bz2 -> yast2-registration-3.1.32.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.31/package/yast2-registration.changes new/yast2-registration-3.1.32/package/yast2-registration.changes --- old/yast2-registration-3.1.31/package/yast2-registration.changes 2014-04-10 11:28:39.000000000 +0200 +++ new/yast2-registration-3.1.32/package/yast2-registration.changes 2014-04-11 16:58:34.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Apr 11 12:14:04 UTC 2014 - lslezak@suse.cz + +- use generic SLP service name for both SMT and SUSE Manager + (fate#316384) +- fixed namespace error when reading SLP service URL +- 3.1.32 + +------------------------------------------------------------------- Thu Apr 10 08:43:48 UTC 2014 - lslezak@suse.cz - ask simple Yes/No for installing online updates (instead of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.31/package/yast2-registration.spec new/yast2-registration-3.1.32/package/yast2-registration.spec --- old/yast2-registration-3.1.31/package/yast2-registration.spec 2014-04-10 11:28:39.000000000 +0200 +++ new/yast2-registration-3.1.32/package/yast2-registration.spec 2014-04-11 16:58:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.31 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.31/src/lib/registration/helpers.rb new/yast2-registration-3.1.32/src/lib/registration/helpers.rb --- old/yast2-registration-3.1.31/src/lib/registration/helpers.rb 2014-04-10 11:28:39.000000000 +0200 +++ new/yast2-registration-3.1.32/src/lib/registration/helpers.rb 2014-04-11 16:58:34.000000000 +0200 @@ -41,12 +41,8 @@ # name of the boot parameter BOOT_PARAM = "reg_url" - REGISTRATION_SERVICES = { - 'susemanager' => 'SUSE Manager' - } - - SUPPORTED_SERVICES = REGISTRATION_SERVICES.keys - + # SLP service name + SLP_SERVICE = "registration.suse" # Get the language for using in HTTP requests (in "Accept-Language" header) def self.language @@ -85,10 +81,10 @@ end # convert service URL to plain URL, remove the SLP service prefix - # "service:susemanager:https://scc.suse.com/connect" -> + # "service:registration.suse:smt:https://scc.suse.com/connect" -> # "https://scc.suse.com/connect" def self.service_url(service) - service.sub(/\Aservice:[^:]+:/, "") + service.sub(/\Aservice:#{Regexp.escape(SLP_SERVICE)}:[^:]+:/, "") end # return "credentials" parameter from URL @@ -105,7 +101,7 @@ # @param service [Yast::SlpServiceClass::Service] SLP service # @return [String] label def self.service_description(service) - url = Registration::Helpers.service_url(service.slp_url) + url = service_url(service.slp_url) descr = service.attributes.to_h[:description] # display URL and the description if it is present @@ -190,10 +186,8 @@ def self.slp_discovery services = [] - SUPPORTED_SERVICES.each do |service_name| - log.info "Searching for #{service_name} SLP services" - services.concat(Yast::SlpService.all(service_name)) - end + log.info "Searching for #{SLP_SERVICE} SLP services" + services.concat(Yast::SlpService.all(SLP_SERVICE)) log.debug "Found services: #{services.inspect}" log.info "Found #{services.size} services: #{services.map(&:slp_url).inspect}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.31/test/discover_registration_services_test.rb new/yast2-registration-3.1.32/test/discover_registration_services_test.rb --- old/yast2-registration-3.1.31/test/discover_registration_services_test.rb 2014-04-10 11:28:39.000000000 +0200 +++ new/yast2-registration-3.1.32/test/discover_registration_services_test.rb 2014-04-11 16:58:34.000000000 +0200 @@ -38,7 +38,7 @@ slp_attributes = double allow(slp_attributes).to receive(:to_h).and_return({:description => "Description"}) allow(slp_service).to receive(:attributes).and_return(slp_attributes) - allow(slp_service).to receive(:slp_url).and_return("service:susemanager:#{slp_url}") + allow(slp_service).to receive(:slp_url).and_return("service:registration.suse:manager:#{slp_url}") allow(slpservice).to receive(:all).and_return([slp_service]) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.31/test/helpers_spec.rb new/yast2-registration-3.1.32/test/helpers_spec.rb --- old/yast2-registration-3.1.31/test/helpers_spec.rb 2014-04-10 11:28:39.000000000 +0200 +++ new/yast2-registration-3.1.32/test/helpers_spec.rb 2014-04-11 16:58:34.000000000 +0200 @@ -98,8 +98,10 @@ describe ".service_url" do it "converts a SLP service to plain URL" do url = "https://example.com/registration" - service = "service:susemanager:#{url}" - expect(Registration::Helpers.service_url(service)).to eq(url) + service1 = "service:registration.suse:manager:#{url}" + service2 = "service:registration.suse:smt:#{url}" + expect(Registration::Helpers.service_url(service1)).to eq(url) + expect(Registration::Helpers.service_url(service2)).to eq(url) end end @@ -110,7 +112,7 @@ before do expect(slp_service).to receive(:attributes).and_return(slp_attributes) - expect(slp_service).to receive(:slp_url).and_return("service:susemanager:#{slp_url}") + expect(slp_service).to receive(:slp_url).and_return("service:registration.suse:manager:#{slp_url}") end it "creates a label with description and url" do continue with "q"... Checked in at Mon Apr 14 11:36:49 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