Hello community,

here is the log from the commit of package yast2-users for openSUSE:Factory 
checked in at 2014-03-01 14:38:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-users (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-users.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-users"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes  2014-02-21 
13:48:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes     
2014-03-01 14:38:31.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Feb 28 13:41:12 CET 2014 - jsuch...@suse.cz
+
+- skip username checks if there's user for import (bnc#866089)
+- 3.1.13
+
+-------------------------------------------------------------------
+Wed Feb 26 16:49:55 CET 2014 - loci...@suse.com
+
+- Fixed users plug-ins package names (bnc#865812)
+- 3.1.12
+
+-------------------------------------------------------------------

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.CKsDoN/_old  2014-03-01 14:38:31.000000000 +0100
+++ /var/tmp/diff_new_pack.CKsDoN/_new  2014-03-01 14:38:31.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:18:49.000000000 +0100
+++ new/yast2-users-3.1.13/package/yast2-users.changes  2014-02-28 
13:58:52.000000000 +0100
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Fri Feb 28 13:41:12 CET 2014 - jsuch...@suse.cz
+
+- skip username checks if there's user for import (bnc#866089)
+- 3.1.13
+
+-------------------------------------------------------------------
+Wed Feb 26 16:49:55 CET 2014 - loci...@suse.com
+
+- Fixed users plug-ins package names (bnc#865812)
+- 3.1.12
+
+-------------------------------------------------------------------
 Thu Feb 20 10:46:56 CET 2014 - jsuch...@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:18:49.000000000 +0100
+++ new/yast2-users-3.1.13/package/yast2-users.spec     2014-02-28 
13:58:52.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:18:50.000000000 +0100
+++ new/yast2-users-3.1.13/src/clients/inst_user_first.rb       2014-02-28 
13:58:52.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:18:50.000000000 +0100
+++ new/yast2-users-3.1.13/src/include/users/widgets.rb 2014-02-28 
13:58:52.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

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to