Hello community, here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at 2016-10-10 16:21:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes 2016-06-07 23:48:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new/yast2-dhcp-server.changes 2016-10-10 16:21:24.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Oct 6 11:25:00 UTC 2016 - [email protected] + +- prevent adding "pool" to global scope as it is allowed only in + network scope (bsc#737492) +- 3.2.0 + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-3.1.11.tar.bz2 New: ---- yast2-dhcp-server-3.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.e38Rw6/_old 2016-10-10 16:21:25.000000000 +0200 +++ /var/tmp/diff_new_pack.e38Rw6/_new 2016-10-10 16:21:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 3.1.11 +Version: 3.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-dhcp-server-3.1.11.tar.bz2 -> yast2-dhcp-server-3.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.11/CONTRIBUTING.md new/yast2-dhcp-server-3.2.0/CONTRIBUTING.md --- old/yast2-dhcp-server-3.1.11/CONTRIBUTING.md 2016-06-06 11:31:30.000000000 +0200 +++ new/yast2-dhcp-server-3.2.0/CONTRIBUTING.md 2016-10-06 14:24:28.000000000 +0200 @@ -3,7 +3,7 @@ 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 YaST maintainers. +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. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - 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 ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 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. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 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). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.11/package/yast2-dhcp-server.changes new/yast2-dhcp-server-3.2.0/package/yast2-dhcp-server.changes --- old/yast2-dhcp-server-3.1.11/package/yast2-dhcp-server.changes 2016-06-06 11:31:30.000000000 +0200 +++ new/yast2-dhcp-server-3.2.0/package/yast2-dhcp-server.changes 2016-10-06 14:24:28.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 6 11:25:00 UTC 2016 - [email protected] + +- prevent adding "pool" to global scope as it is allowed only in + network scope (bsc#737492) +- 3.2.0 + +------------------------------------------------------------------- Mon Jun 6 09:07:26 UTC 2016 - [email protected] - Stop generating autodocs (fate#320356) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.11/package/yast2-dhcp-server.spec new/yast2-dhcp-server-3.2.0/package/yast2-dhcp-server.spec --- old/yast2-dhcp-server-3.1.11/package/yast2-dhcp-server.spec 2016-06-06 11:31:30.000000000 +0200 +++ new/yast2-dhcp-server-3.2.0/package/yast2-dhcp-server.spec 2016-10-06 14:24:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 3.1.11 +Version: 3.2.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.11/src/include/dhcp-server/dialogs.rb new/yast2-dhcp-server-3.2.0/src/include/dhcp-server/dialogs.rb --- old/yast2-dhcp-server-3.1.11/src/include/dhcp-server/dialogs.rb 2016-06-06 11:31:30.000000000 +0200 +++ new/yast2-dhcp-server-3.2.0/src/include/dhcp-server/dialogs.rb 2016-10-06 14:24:28.000000000 +0200 @@ -378,27 +378,27 @@ par_id = @parent_id par_type = @parent_type while par_id != "" - parents = Builtins.add(parents, par_type) + parents << par_type par = DhcpServer.GetEntryParent(par_type, par_id) par_type = Ops.get(par, "type", "") par_id = Ops.get(par, "id", "") end possible = ["subnet", "host", "shared-network", "group", "pool", "class"] - if Builtins.contains(parents, "class") || - Builtins.contains(parents, "host") || - Builtins.contains(parents, "pool") + # leaf nodes means, that we do not add anything below it + if !(["class", "host", "pool"] & parents).empty? return :back end - f = [] - if Builtins.contains(parents, "subnet") - f = Builtins.add(f, "subnet") - f = Builtins.add(f, "shared-network") + excluded = ["pool"] + if parents.include?("subnet") + excluded.delete("pool") + excluded << "subnet" + excluded << "shared-network" end - if Builtins.contains(parents, "shared-network") - f = Builtins.add(f, "shared-network") + if parents.include?("shared-network") + excluded << "shared-network" end - possible = Builtins.filter(possible) { |s| !Builtins.contains(f, s) } + possible -= excluded return :back if possible == [] labels = {
