[yast-commit] [ci_new_pac] JFYI yast2-registration -> sle12
![](https://seccdn.libravatar.org/avatar/af626ca29b1318211e3f416634b5db76.jpg?s=120&d=mm&r=g)
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-02-14 17:57:52.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-02-21 09:06:54.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 21 08:02:38 UTC 2014 - vmoravec@suse.com + +- Add SLP service discovery dialog for registration (FATE#316384) +- 3.1.8 + +------------------------------------------------------------------- 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:33256 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.7.tar.bz2 New: ---- yast2-registration-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.coqQT1/_old 2014-02-24 15:01:44.000000000 +0100 +++ /var/tmp/diff_new_pack.coqQT1/_new 2014-02-24 15:01:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,6 +32,7 @@ Requires: yast2-ruby-bindings >= 3.1.7 # SCC API library Requires: rubygem-scc_api +Requires: yast2-slp >= 3.1.2 BuildRequires: yast2 >= 2.23.13 BuildRequires: update-desktop-files @@ -40,6 +41,7 @@ BuildArch: noarch Summary: YaST2 - Registration Module +Url: https://github.com/yast/yast-registration %description The registration module to register products and/or to fetch an update ++++++ yast2-registration-3.1.7.tar.bz2 -> yast2-registration-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.7/package/yast2-registration.changes new/yast2-registration-3.1.8/package/yast2-registration.changes --- old/yast2-registration-3.1.7/package/yast2-registration.changes 2014-02-14 17:25:18.000000000 +0100 +++ new/yast2-registration-3.1.8/package/yast2-registration.changes 2014-02-21 09:05:05.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 21 08:02:38 UTC 2014 - vmoravec@suse.com + +- Add SLP service discovery dialog for registration (FATE#316384) +- 3.1.8 + +------------------------------------------------------------------- Fri Feb 14 16:09:13 UTC 2014 - lslezak@suse.cz - display progress when adding registered services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.7/package/yast2-registration.spec new/yast2-registration-3.1.8/package/yast2-registration.spec --- old/yast2-registration-3.1.7/package/yast2-registration.spec 2014-02-14 17:25:18.000000000 +0100 +++ new/yast2-registration-3.1.8/package/yast2-registration.spec 2014-02-21 09:05:05.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,6 +32,7 @@ Requires: yast2-ruby-bindings >= 3.1.7 # SCC API library Requires: rubygem-scc_api +Requires: yast2-slp >= 3.1.2 BuildRequires: yast2 >= 2.23.13 BuildRequires: update-desktop-files @@ -40,6 +41,7 @@ BuildArch: noarch Summary: YaST2 - Registration Module +Url: https://github.com/yast/yast-registration %description The registration module to register products and/or to fetch an update diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.7/src/clients/discover_registration_services.rb new/yast2-registration-3.1.8/src/clients/discover_registration_services.rb --- old/yast2-registration-3.1.7/src/clients/discover_registration_services.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-registration-3.1.8/src/clients/discover_registration_services.rb 2014-02-21 09:05:05.000000000 +0100 @@ -0,0 +1,119 @@ +module Yast + import 'SlpService' + import 'UI' + import 'Label' + import 'Report' + + class DiscoverRegistrationServicesClient < Client + include Yast::Logger + + REGISTRATION_SERVICES = { + 'susemanager' => 'SUSE Manager' + } + + SUPPORTED_SERVICES = REGISTRATION_SERVICES.keys + + attr_reader :services + + def initialize + @services = [] + end + + def main + busy_box do + log.info( + "Searching for SLP registration services of type #{SUPPORTED_SERVICES.join(', ')}" + ) + SUPPORTED_SERVICES.each do |service_name| + services.concat(SlpService.all(service_name)) + end + end + + if services.empty? + return Report.Message _('No registration server found') + else + log.info( + "Found #{services.size} services: #{services.map(&:slp_url).join(', ')}" + ) + end + + select_registration_service + end + + private + + def select_registration_service + UI.OpenDialog( + Opt(:decorated), + VBox( + Label(_('Available local registration servers')), + VSpacing(0.6), + RadioButtonGroup( + Id(:services), + Left( + HVSquash( + VBox(*services_radio_buttons) + ) + ) + ), + ButtonBox( + PushButton(Id(:ok), Label.OKButton), + PushButton(Id(:cancel), Label.CancelButton) + ) + ) + ) + + loop do + dialog_result = UI.UserInput + case dialog_result + when :ok + selected = UI.QueryWidget(Id(:services), :CurrentButton) + if !selected + Report.Error(_('Please select one of the registration servers')) + next + end + select_service(services[selected.to_i]) + UI.CloseDialog + break + when :cancel + UI.CloseDialog + break + end + end + end + + def select_service(service) + log.info("Selected registration service: #{service.inspect}") + #TODO Assign the service to a module or a global object now + end + + def services_radio_buttons + services.map.with_index do |service, index| + Left( + RadioButton( + Id(index.to_s), + service_description(service), + false + ) + ) + end + end + + def service_description(service) + name = REGISTRATION_SERVICES[service.name] + url = "#{service.protocol}://#{service.host}:#{service.port} " + attributes = service.attributes.to_h.map do |name, value| + "#{name}=#{value} " + end + "#{name} #{url} #{attributes.join}" + end + + def busy_box + Popup.ShowFeedback(_('Searching for registration servers...'), '') + yield + ensure + Popup.ClearFeedback + end + end + DiscoverRegistrationServicesClient.new.main +end continue with "q"... Checked in at Mon Feb 24 15:01:55 CET 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