Hello community,

here is the log from the commit of package yast2-users for openSUSE:Leap:15.2 
checked in at 2020-05-19 14:08:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/yast2-users (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.yast2-users.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-users"

Tue May 19 14:08:47 2020 rev:54 rq:806955 version:4.2.11

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/yast2-users/yast2-users.changes        
2020-03-19 08:35:49.645830343 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.yast2-users.new.2738/yast2-users.changes      
2020-05-19 14:08:51.215042096 +0200
@@ -1,0 +2,8 @@
+Wed May 13 14:04:35 CEST 2020 - sch...@suse.de
+
+- AY proposal: Fixed crash. Showing user settings only because the
+  UI does not fit to the AY settings. The user cannot change these
+  settings anymore (bsc#1170815).
+- 4.2.11
+
+-------------------------------------------------------------------

Old:
----
  yast2-users-4.2.10.tar.bz2

New:
----
  yast2-users-4.2.11.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.MKDQRe/_old  2020-05-19 14:08:51.583042811 +0200
+++ /var/tmp/diff_new_pack.MKDQRe/_new  2020-05-19 14:08:51.583042811 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-users
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,17 +12,17 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           yast2-users
-Version:        4.2.10
+Version:        4.2.11
 Release:        0
 Summary:        YaST2 - User and Group Configuration
 License:        GPL-2.0-only
 Group:          System/YaST
-Url:            https://github.com/yast/yast-users
+URL:            https://github.com/yast/yast-users
 
 Source0:        %{name}-%{version}.tar.bz2
 

++++++ yast2-users-4.2.10.tar.bz2 -> yast2-users-4.2.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-users-4.2.10/CONTRIBUTING.md 
new/yast2-users-4.2.11/CONTRIBUTING.md
--- old/yast2-users-4.2.10/CONTRIBUTING.md      2020-03-13 09:50:43.000000000 
+0100
+++ new/yast2-users-4.2.11/CONTRIBUTING.md      1970-01-01 01:00:00.000000000 
+0100
@@ -1,89 +0,0 @@
-YaST Contribution Guidelines
-============================
-
-YaST is an open source project and as such it welcomes all kinds of
-contributions. If you decide to contribute, please follow these guidelines to
-ensure the process is effective and pleasant both for you and the YaST 
maintainers.
-
-There are two main forms of contribution: reporting bugs and performing code
-changes.
-
-Bug Reports
------------
-
-If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
-or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
-registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
-if you don't have an account yet.)
-
-When creating a bug report, please follow our [bug reporting
-guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
-
-We can't guarantee that every bug will be fixed, but we'll try.
-
-Code Changes
-------------
-
-We welcome all kinds of code contributions, from simple bug fixes to 
significant
-refactorings and implementation of new features. However, before making any
-non-trivial contribution, get in touch with us first — this can prevent wasted
-effort on both sides. Also, have a look at our [development
-documentation](http://en.opensuse.org/openSUSE:YaST_development).
-
-To send us your code change, use GitHub pull requests. The workflow is as
-follows:
-
-  1. Fork the project.
-
-  2. Create a topic branch based on `master`.
-
-  3. Implement your change, including tests (if possible). Make sure you adhere
-     to the [Ruby style
-     guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
-
-  4. Update the package version (in `packages/*.spec`, usually by
-     `rake version:bump`) and add a new entry to the `package/*.changes` file
-     (by `osc vc package`).  
-     For bigger changes or changes which need longer discussion it is advised 
to
-     add this as a separate last commit so it can be easily updated when 
another
-     change is merged in the meantime.
-
-  5. Make sure your change didn't break anything by building the RPM package
-     (`rake osc:build`). The build process includes running the full testsuite.
-
-  6. Publish the branch and create a pull request.
-
-  7. YaST developers will review your change and possibly point out issues.
-     Adapt the code under their guidance until they are all resolved.
-
-  8. Finally, the pull request will get merged or rejected.
-
-See also [GitHub's guide on
-contributing](https://help.github.com/articles/fork-a-repo).
-
-If you want to do multiple unrelated changes, use separate branches and pull
-requests.
-
-### Commits
-
-Each commit in the pull request should do only one thing, which is clearly
-described by its commit message. Especially avoid mixing formatting changes and
-functional changes into one commit. When writing commit messages, adhere to
-[widely used
-conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-
-If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure
-you mention it in the commit message for cross-reference. Use format like
-bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
-autolinking](https://help.github.com/articles/github-flavored-markdown#references)
-and [openSUSE abbreviation
-reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
-
-Additional Information
-----------------------
-
-If you have any question, feel free to ask at the [development mailing
-list](http://lists.opensuse.org/yast-devel/) or at the
-[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
-We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-users-4.2.10/Dockerfile 
new/yast2-users-4.2.11/Dockerfile
--- old/yast2-users-4.2.10/Dockerfile   2020-03-13 09:50:43.000000000 +0100
+++ new/yast2-users-4.2.11/Dockerfile   2020-05-13 14:59:43.000000000 +0200
@@ -1,4 +1,4 @@
-FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest
+FROM registry.opensuse.org/yast/sle-15/sp2/containers/yast-cpp
 RUN zypper --non-interactive in --force-resolution --no-recommends \
   cracklib-devel \
   perl-Digest-SHA1 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-users-4.2.10/Rakefile 
new/yast2-users-4.2.11/Rakefile
--- old/yast2-users-4.2.10/Rakefile     2020-03-13 09:50:43.000000000 +0100
+++ new/yast2-users-4.2.11/Rakefile     2020-05-13 14:59:43.000000000 +0200
@@ -1,5 +1,7 @@
 require "yast/rake"
 
+Yast::Tasks.submit_to :sle15sp2
+
 Yast::Tasks.configuration do |conf|
   # lets ignore license check for now
   conf.skip_license_check << /.*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-users-4.2.10/package/yast2-users.changes 
new/yast2-users-4.2.11/package/yast2-users.changes
--- old/yast2-users-4.2.10/package/yast2-users.changes  2020-03-13 
09:50:43.000000000 +0100
+++ new/yast2-users-4.2.11/package/yast2-users.changes  2020-05-13 
14:59:43.000000000 +0200
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Wed May 13 14:04:35 CEST 2020 - sch...@suse.de
+
+- AY proposal: Fixed crash. Showing user settings only because the
+  UI does not fit to the AY settings. The user cannot change these
+  settings anymore (bsc#1170815).
+- 4.2.11
+
+-------------------------------------------------------------------
 Thu Mar 12 19:35:07 UTC 2020 - Knut Anderssen <kanders...@suse.com>
 
 - Request confirmation for aborting in the dialog for setting the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-users-4.2.10/package/yast2-users.spec 
new/yast2-users-4.2.11/package/yast2-users.spec
--- old/yast2-users-4.2.10/package/yast2-users.spec     2020-03-13 
09:50:43.000000000 +0100
+++ new/yast2-users-4.2.11/package/yast2-users.spec     2020-05-13 
14:59:43.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        4.2.10
+Version:        4.2.11
 Release:        0
 Summary:        YaST2 - User and Group Configuration
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-users-4.2.10/src/lib/users/proposal.rb 
new/yast2-users-4.2.11/src/lib/users/proposal.rb
--- old/yast2-users-4.2.10/src/lib/users/proposal.rb    2020-03-13 
09:50:43.000000000 +0100
+++ new/yast2-users-4.2.11/src/lib/users/proposal.rb    2020-05-13 
14:59:43.000000000 +0200
@@ -27,15 +27,24 @@
 
     def initialize
       Yast.import "Wizard"
+      Yast.import "Mode"
       textdomain "users"
     end
 
     def make_proposal(_attrs)
-      {
-        "preformatted_proposal" => HTML.List([users_proposal, root_proposal, 
encrypt_proposal]),
-        "language_changed"      => false,
-        "links"                 => ["users--user", "users--root", 
"users--encryption"]
-      }
+      if Mode.auto
+        {
+          "preformatted_proposal" => HTML.List([users_ay]),
+          "language_changed"      => false,
+          "links"                 => []
+        }
+      else
+        {
+          "preformatted_proposal" => HTML.List([users_proposal, root_proposal, 
encrypt_proposal]),
+          "language_changed"      => false,
+          "links"                 => ["users--user", "users--root", 
"users--encryption"]
+        }
+      end
     end
 
     def ask_user(param)
@@ -51,14 +60,15 @@
       when "users--root"
         UsersSimple.SkipRootPasswordDialog(false) # do not skip now...
         client = "inst_root_first"
-      when "users--user"
+      when "users" || "users--user"
         args["root_dialog_follows"] = false
         client = "inst_user_first"
       when "users--encryption"
         client = "users_encryption_method"
       else
-        raise "Unknown action id: #{id}"
+        raise "Unknown action id: #{param['chosen_id']}"
       end
+
       result = WFM.CallFunction(client, [args])
 
       Wizard.CloseDialog
@@ -68,23 +78,37 @@
     end
 
     def description
-      {
-        "id"              => "users",
-        # rich text label
-        "rich_text_title" => _("User Settings"),
-        "menu_titles"     => [
-          # menu button label
+      menu = []
+      id = ""
+
+      if !Mode.auto
+        menu = [ # menu button label
           { "id" => "users--user", "title" => _("&User") },
           # menu button label
           { "id" => "users--root", "title" => _("&Root Password") },
           # menu button label
-          { "id" => "users--encryption", "title" => _("Password &Encryption 
Type") }
-        ]
+          { "id" => "users--encryption", "title" => _("Password &Encryption 
Type") }]
+        id = "users"
+      end
+
+      {
+        "id"              => id,
+        # rich text label
+        "rich_text_title" => _("User Settings"),
+        "menu_titles"     => menu
       }
     end
 
   private
 
+    def users_ay
+      export = Users.Export()
+      ret = _("Number of defined users/groups:")
+      ret += "<ul>\n<li>" + format(_("Users: %d"), export["users"].count()) + 
"</li>\n"
+      ret += "<li>" + format(_("Groups: %d"), export["groups"].count()) + 
"</li></ul>"
+      ret
+    end
+
     def root_proposal
       msg = if UsersSimple.GetRootPassword != ""
         # TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched


Reply via email to