[yast-commit] [ci_new_pac] JFYI yast2-users -> 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-users -> sle12 ## BNC# 866089 : "installation - read user data from previous installation" (RESOLVED/FIXED) ## BNC# 865812 : "can't configure ldap login" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-users/yast2-users.changes 2014-02-24 15:03:12.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-users/yast2-users.changes 2014-02-28 15:10:34.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Feb 28 13:41:12 CET 2014 - jsuchome@suse.cz + +- skip username checks if there's user for import (bnc#866089) +- 3.1.13 + +------------------------------------------------------------------- +Wed Feb 26 16:49:55 CET 2014 - locilka@suse.com + +- Fixed users plug-ins package names (bnc#865812) +- 3.1.12 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-auth-server - yast2-ftp-server - yast2-inetd - yast2-mail - yast2-samba-server - yast2-sudo - yast2-users ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-users (Old) and /mounts/work_src_done/SLE12/yast2-users (BS:build ID:33665 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-users-3.1.11.tar.bz2 New: ---- yast2-users-3.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.XxAdjD/_old 2014-02-28 16:05:56.000000000 +0100 +++ /var/tmp/diff_new_pack.XxAdjD/_new 2014-02-28 16:05:56.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.11 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.1.11.tar.bz2 -> yast2-users-3.1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.11/package/yast2-users.changes new/yast2-users-3.1.13/package/yast2-users.changes --- old/yast2-users-3.1.11/package/yast2-users.changes 2014-02-21 10:15:08.000000000 +0100 +++ new/yast2-users-3.1.13/package/yast2-users.changes 2014-02-28 15:06:11.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Feb 28 13:41:12 CET 2014 - jsuchome@suse.cz + +- skip username checks if there's user for import (bnc#866089) +- 3.1.13 + +------------------------------------------------------------------- +Wed Feb 26 16:49:55 CET 2014 - locilka@suse.com + +- Fixed users plug-ins package names (bnc#865812) +- 3.1.12 + +------------------------------------------------------------------- Thu Feb 20 10:46:56 CET 2014 - jsuchome@suse.cz - save Autologin settings at the end of installation (bnc#863436) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.11/package/yast2-users.spec new/yast2-users-3.1.13/package/yast2-users.spec --- old/yast2-users-3.1.11/package/yast2-users.spec 2014-02-21 10:15:08.000000000 +0100 +++ new/yast2-users-3.1.13/package/yast2-users.spec 2014-02-28 15:06:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.1.11 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.11/src/clients/inst_user_first.rb new/yast2-users-3.1.13/src/clients/inst_user_first.rb --- old/yast2-users-3.1.11/src/clients/inst_user_first.rb 2014-02-21 10:15:08.000000000 +0100 +++ new/yast2-users-3.1.13/src/clients/inst_user_first.rb 2014-02-28 15:06:11.000000000 +0100 @@ -336,6 +336,9 @@ # map with id's of confirmed questions @ui_map = {} + # if there's user to import, we do not have to continue with checks + break if @to_import.size > 0 + # username checks @username = UI.QueryWidget(Id(:username), :Value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.1.11/src/include/users/widgets.rb new/yast2-users-3.1.13/src/include/users/widgets.rb --- old/yast2-users-3.1.11/src/include/users/widgets.rb 2014-02-21 10:15:08.000000000 +0100 +++ new/yast2-users-3.1.13/src/include/users/widgets.rb 2014-02-28 15:06:11.000000000 +0100 @@ -2356,31 +2356,45 @@ def InitAuthData(key) mb = [] - to_string = { - # menubutton label - "nis" => _("&NIS"), - # menubutton label - "nisplus" => _("N&IS+"), - # menubutton label - "ldap" => _("&LDAP"), - # menubutton label - "kerberos" => _("&Kerberos"), - # menubutton label - "samba" => _("&Samba") + auth_methods = { + "nis" => { + # menubutton label + "label" => _("&NIS"), + "package" => "yast2-nis-client", + }, + "ldap" => { + # menubutton label + "label" => _("&LDAP"), + "package" => "yast2-auth-client", + }, + "kerberos" => { + # menubutton label + "label" => _("&Kerberos"), + "package" => "yast2-auth-client", + }, + "samba" => { + # menubutton label + "label" => _("&Samba"), + "package" => "yast2-samba-client", + }, } # check availability of authentication packages, # update the RichText summary and menubutton labels accordingly Builtins.foreach(@configurable_clients) do |client| - package = Builtins.sformat("yast2-%1-client", client) + package = auth_methods[client]["package"] or raise "Unknown auth client #{client}" + client_item = Item( Id(client), - Ops.get_string(to_string, client, client) + auth_methods[client]["label"] ) + if Package.Installed(package) @installed_clients = Builtins.add(@installed_clients, client) end - mb = Builtins.add(mb, client_item) + + mb << client_item + UI.ChangeWidget( Id("auth_summary"), :Value, @@ -2390,7 +2404,8 @@ ) ) end - if Ops.greater_than(Builtins.size(mb), 0) + + if ! mb.empty? UI.ReplaceWidget( Id(:rpbutton), # menu button label continue with "q"... Checked in at Fri Feb 28 16:06:09 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