Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2020-05-15 23:51:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-users" Fri May 15 23:51:03 2020 rev:230 rq:805550 version:4.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2020-03-16 10:17:41.735571528 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-users.new.2738/yast2-users.changes 2020-05-15 23:51:04.773401111 +0200 @@ -1,0 +2,15 @@ +Wed May 13 14:04:35 UTC 2020 - [email protected] + +- 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.3.1 + +------------------------------------------------------------------- +Wed May 13 10:55:56 UTC 2020 - Josef Reidinger <[email protected]> + +- Autoyast schema: Allow optional types for string and map objects + (bsc#1170886) +- 4.3.0 + +------------------------------------------------------------------- Old: ---- yast2-users-4.2.10.tar.bz2 New: ---- yast2-users-4.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.9Q5f7j/_old 2020-05-15 23:51:06.533404503 +0200 +++ /var/tmp/diff_new_pack.9Q5f7j/_new 2020-05-15 23:51:06.537404511 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 4.2.10 +Version: 4.3.1 Release: 0 Summary: YaST2 - User and Group Configuration License: GPL-2.0-only ++++++ yast2-users-4.2.10.tar.bz2 -> yast2-users-4.3.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.10/.travis.yml new/yast2-users-4.3.1/.travis.yml --- old/yast2-users-4.2.10/.travis.yml 2020-03-13 09:50:43.000000000 +0100 +++ new/yast2-users-4.3.1/.travis.yml 2020-05-14 11:55:05.000000000 +0200 @@ -11,6 +11,6 @@ script: # the "yast-travis-cpp" script is included in the base yastdevel/cpp image # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-cpp - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-users-image yast-travis-cpp - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e COVERAGE=1 -e CI=1 yast-users-image rake test:unit - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e COVERAGE=1 -e CI=1 yast-users-image rake check:doc + - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-users-image yast-travis-cpp + - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e COVERAGE=1 -e CI=1 yast-users-image rake test:unit + - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" -e COVERAGE=1 -e CI=1 yast-users-image rake check:doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-4.2.10/CONTRIBUTING.md new/yast2-users-4.3.1/CONTRIBUTING.md --- old/yast2-users-4.2.10/CONTRIBUTING.md 2020-03-13 09:50:43.000000000 +0100 +++ new/yast2-users-4.3.1/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/package/yast2-users.changes new/yast2-users-4.3.1/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.3.1/package/yast2-users.changes 2020-05-14 11:55:05.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed May 13 14:04:35 UTC 2020 - [email protected] + +- 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.3.1 + +------------------------------------------------------------------- +Wed May 13 10:55:56 UTC 2020 - Josef Reidinger <[email protected]> + +- Autoyast schema: Allow optional types for string and map objects + (bsc#1170886) +- 4.3.0 + +------------------------------------------------------------------- Thu Mar 12 19:35:07 UTC 2020 - Knut Anderssen <[email protected]> - 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.3.1/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.3.1/package/yast2-users.spec 2020-05-14 11:55:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 4.2.10 +Version: 4.3.1 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/autoyast-rnc/users.rnc new/yast2-users-4.3.1/src/autoyast-rnc/users.rnc --- old/yast2-users-4.2.10/src/autoyast-rnc/users.rnc 2020-03-13 09:50:43.000000000 +0100 +++ new/yast2-users-4.3.1/src/autoyast-rnc/users.rnc 2020-05-14 11:55:05.000000000 +0200 @@ -4,9 +4,14 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"; namespace config = "http://www.suse.com/1.0/configns"; +include "common.rnc" + login_settings = element login_settings { - element autologin_user { text }? & - element password_less_login { BOOLEAN }? + MAP, + ( + element autologin_user { STRING }? & + element password_less_login { BOOLEAN }? + ) } groups = @@ -15,29 +20,35 @@ gr_group* } gr_group = element group { + MAP, + ( encrypted? & - element group_password { text }? & - element groupname { text }? & - element userlist { text }? & - element gid { text }? + element group_password { STRING }? & + element groupname { STRING }? & + element userlist { STRING }? & + element gid { STRING }? + ) } user_defaults = element user_defaults { - expire? & - ud_group? & - ud_groups? & - home? & - inactive? & - no_groups? & - shell? & - skel? & - umask? + MAP, + ( + expire? & + ud_group? & + ud_groups? & + home? & + inactive? & + no_groups? & + shell? & + skel? & + umask? + ) } # by default, AutoYaST exports list entries as 'listentry' authorized_key = - element authorized_key { text } | element listentry { text } + element authorized_key { STRING } | element listentry { STRING } authorized_keys = element authorized_keys { @@ -45,15 +56,17 @@ authorized_key* } -expire = element expire { text } -ud_group = element group { text } -ud_groups = element groups { text } -inactive = element inactive { text } +expire = element expire { STRING } +ud_group = element group { STRING } +ud_groups = element groups { STRING } +inactive = element inactive { STRING } no_groups = element no_groups { BOOLEAN } -shell = element shell { text } -skel = element skel { text } -umask = element umask { text } +shell = element shell { STRING } +skel = element skel { STRING } +umask = element umask { STRING } user = element user { + MAP, + ( encrypted? & fullname? & surname? & @@ -69,27 +82,31 @@ u_groups? & password_settings? & authorized_keys? + ) } encrypted = element encrypted { BOOLEAN } -fullname = element fullname { text } -u_forename = element forename { text } -surname = element surname { text } -u_gid = element gid { text } -home = element home { text } +fullname = element fullname { STRING } +u_forename = element forename { STRING } +surname = element surname { STRING } +u_gid = element gid { STRING } +home = element home { STRING } home_btrfs_subvolume = element home_btrfs_subvolume { BOOLEAN } -user_password = element user_password { text } -username = element username { text } -uid = element uid { text } -u_group = element group { text } -u_groups = element groups { text } +user_password = element user_password { STRING } +username = element username { STRING } +uid = element uid { STRING } +u_group = element group { STRING } +u_groups = element groups { STRING } password_settings = element password_settings { - element expire { text }? & - element flag { text }? & - element inact { text }? & - element max { text }? & - element min { text }? & - element warn { text }? + MAP, + ( + element expire { STRING }? & + element flag { STRING }? & + element inact { STRING }? & + element max { STRING }? & + element min { STRING }? & + element warn { STRING }? + ) } users = 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.3.1/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.3.1/src/lib/users/proposal.rb 2020-05-14 11:55:05.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
