Hello community, here is the log from the commit of package yast2-drbd for openSUSE:Factory checked in at 2016-09-11 00:54:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-drbd (Old) and /work/SRC/openSUSE:Factory/.yast2-drbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-drbd" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-drbd/yast2-drbd.changes 2016-08-05 18:17:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-drbd.new/yast2-drbd.changes 2016-09-11 00:55:04.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Sep 9 09:26:45 UTC 2016 - [email protected] + +- bsc#997838, fix error of rename a exist drbd resource. +- Version 3.1.26 + +------------------------------------------------------------------- +Thu Sep 8 02:30:51 UTC 2016 - [email protected] + +- fate#321158, remove automatic change lvm filter +- Version 3.1.25 + +------------------------------------------------------------------- Old: ---- yast2-drbd-3.1.24.tar.bz2 New: ---- yast2-drbd-3.1.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.lY8uNr/_old 2016-09-11 00:55:05.000000000 +0200 +++ /var/tmp/diff_new_pack.lY8uNr/_new 2016-09-11 00:55:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.24 +Version: 3.1.26 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services ++++++ yast2-drbd-3.1.24.tar.bz2 -> yast2-drbd-3.1.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/CONTRIBUTING.md new/yast2-drbd-3.1.26/CONTRIBUTING.md --- old/yast2-drbd-3.1.24/CONTRIBUTING.md 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/CONTRIBUTING.md 2016-09-09 11:30:07.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-drbd-3.1.24/package/yast2-drbd.changes new/yast2-drbd-3.1.26/package/yast2-drbd.changes --- old/yast2-drbd-3.1.24/package/yast2-drbd.changes 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/package/yast2-drbd.changes 2016-09-09 11:30:07.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Sep 9 09:26:45 UTC 2016 - [email protected] + +- bsc#997838, fix error of rename a exist drbd resource. +- Version 3.1.26 + +------------------------------------------------------------------- +Thu Sep 8 02:30:51 UTC 2016 - [email protected] + +- fate#321158, remove automatic change lvm filter +- Version 3.1.25 + +------------------------------------------------------------------- Thu Aug 4 07:51:32 UTC 2016 - [email protected] - Syntax change: support resync-rate in disk section, fix bsc#991253 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/package/yast2-drbd.spec new/yast2-drbd-3.1.26/package/yast2-drbd.spec --- old/yast2-drbd-3.1.24/package/yast2-drbd.spec 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/package/yast2-drbd.spec 2016-09-09 11:30:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.24 +Version: 3.1.26 Release: 0 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/src/include/drbd/helps.rb new/yast2-drbd-3.1.26/src/include/drbd/helps.rb --- old/yast2-drbd-3.1.24/src/include/drbd/helps.rb 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/src/include/drbd/helps.rb 2016-09-09 11:30:07.000000000 +0200 @@ -120,7 +120,7 @@ "\t\t<p>Refer to 'man lvm.conf' for further information including the file layout.</p>\n" + "\t\t\t\t\t\t\t\t\t\t \n" + "\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>" + - "\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n" + + "\t\t<p><b>LVM Filter</b>: A filter that tells LVM2 to only use a restricted set of devices.</p>\n" + "\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>" + "\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n" + "\n" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/src/include/drbd/lvm_conf.rb new/yast2-drbd-3.1.26/src/include/drbd/lvm_conf.rb --- old/yast2-drbd-3.1.24/src/include/drbd/lvm_conf.rb 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/src/include/drbd/lvm_conf.rb 2016-09-09 11:30:07.000000000 +0200 @@ -16,8 +16,6 @@ @cache = true @lvmetad = false - # Default is always true (auto) - @auto_lvm_filter = true end def lvm_conf_Read @@ -46,16 +44,6 @@ VBox( VBox( Left( - CheckBox( - Id(:AutoFilter), - Opt(:notify), - _("Modify LVM Device filter Automatically"), - @auto_lvm_filter - ) - ) - ), - VBox( - Left( InputField( Id(:Filter), Opt(:hstretch), @@ -130,7 +118,6 @@ def lvm_conf_Write @filter = UI.QueryWidget(Id(:Filter), :Value).to_s - @auto_lvm_filter = UI.QueryWidget(Id(:AutoFilter), :Value) @cache = UI.QueryWidget(Id(:LVMCache), :Value) if @cache @@ -146,40 +133,24 @@ lvmetad_str = "0" end - Drbd.auto_lvm_filter = @auto_lvm_filter Ops.set(Drbd.lvm_config, "write_cache_state", cache_str) Ops.set(Drbd.lvm_config, "use_lvmetad", lvmetad_str) - if !@auto_lvm_filter - Ops.set(Drbd.lvm_config, "filter", @filter) - Builtins.y2debug("Change Device Filter manually.") - end + Ops.set(Drbd.lvm_config, "filter", @filter) Drbd.modified = true true end - def status_switch - if UI.QueryWidget(Id(:AutoFilter), :Value) - UI.ChangeWidget(Id(:Filter), :Enabled, false) - else - UI.ChangeWidget(Id(:Filter), :Enabled, true) - end - - nil - end - def ConfigureLVMDialog lvm_conf_Read my_SetContents("lvm_conf", lvm_conf_GetDialog) - status_switch ret = nil while true Wizard.SelectTreeItem("lvm_conf") - status_switch ret = UI.UserInput @@ -192,7 +163,7 @@ ret = Convert.to_string(UI.QueryWidget(Id(:wizardTree), :CurrentItem)) end - if ret == :Filter || ret == :LVMCache || ret == :AutoFilter + if ret == :Filter || ret == :LVMCache Drbd.modified = true next end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/src/include/drbd/resource_conf.rb new/yast2-drbd-3.1.26/src/include/drbd/resource_conf.rb --- old/yast2-drbd-3.1.24/src/include/drbd/resource_conf.rb 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/src/include/drbd/resource_conf.rb 2016-09-09 11:30:07.000000000 +0200 @@ -221,11 +221,6 @@ nodes are %2.", local_hname, node_list) end - if disk && !Drbd.local_disks_ori.include?(disk) && - !Drbd.local_disks_added.include?(disk) - Drbd.local_disks_added.push(disk) - end - nil end @@ -891,11 +886,9 @@ if Ops.greater_than(Builtins.size(orires), 0) # Remove the original res configuration - Drbd.resource_config = Builtins.remove( - Drbd.resource_config, - orires - ) - #Ops.set(Drbd.resource_config, orires, nil) + # Since resource_config is in memory, should + # rewrite as nil to remove + Ops.set(Drbd.resource_config, orires, nil) else Builtins.y2debug("add new resouce") end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/src/modules/Drbd.rb new/yast2-drbd-3.1.26/src/modules/Drbd.rb --- old/yast2-drbd-3.1.24/src/modules/Drbd.rb 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/src/modules/Drbd.rb 2016-09-09 11:30:07.000000000 +0200 @@ -50,7 +50,6 @@ @modified = false @global_config = {} @lvm_config = {} - @auto_lvm_filter = true @resource_config = {} @drbd_dir = "/etc" @start_daemon = false @@ -76,7 +75,6 @@ @local_hostname = "" @local_ports = [] @local_disks_ori = [] - @local_disks_added = [] @global_error = "" end @@ -322,8 +320,8 @@ end if Ops.get(@lvm_config, "filter") == nil - # The default value is get from HA doc - Ops.set(@lvm_config, "filter", "[ \"r|/dev/sda.*|\" ]") + # The default value is get from lvm.conf to exclude the cdrom + Ops.set(@lvm_config, "filter", "[ \"r|/dev/cdrom|\" ]") end if Ops.get(@lvm_config, "write_cache_state") == nil Ops.set(@lvm_config, "write_cache_state", "0") @@ -619,6 +617,11 @@ def calcConnectionMesh() @resource_config.each do |resname, res_config| + # continue if res_config is nil (deleted) + if res_config == nil + next + end + node_list = [] Builtins.foreach(Ops.get_map(res_config, "on", {})) do |name, val| node_list = Builtins.add(node_list, name) @@ -699,11 +702,6 @@ @lvm_config ) - # Change(add reject rules) filter automatically - if @auto_lvm_filter && !@local_disks_added.empty? - format_lvm_filter - end - ["filter", "write_cache_state"].each do |key| if Ops.get(@lvm_config, key) != nil SCR.Write( @@ -790,7 +788,6 @@ publish :variable => :modified, :type => "boolean" publish :variable => :global_config, :type => "map" publish :variable => :lvm_config, :type => "map" - publish :variable => :auto_lvm_filter, :type => "boolean" publish :variable => :resource_config, :type => "map" publish :variable => :drbd_dir, :type => "string" publish :variable => :start_daemon, :type => "boolean" @@ -798,7 +795,6 @@ publish :variable => :local_hostname, :type => "string" publish :variable => :local_ports, :type => "list <string>" publish :variable => :local_disks_ori, :type => "list <string>" - publish :variable => :local_disks_added, :type => "list <string>" publish :variable => :global_error, :type => "string" publish :function => :Read, :type => "boolean ()" publish :function => :Write, :type => "boolean ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/src/servers_non_y2/ag_drbd new/yast2-drbd-3.1.26/src/servers_non_y2/ag_drbd --- old/yast2-drbd-3.1.24/src/servers_non_y2/ag_drbd 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/src/servers_non_y2/ag_drbd 2016-09-09 11:30:07.000000000 +0200 @@ -1253,7 +1253,7 @@ module_eval(<<'.,.,', 'drbd.rb.yy', 105) def _reduce_63(val, _values, result) - return ["#{val[0]}", ""]; + return ["#{val[0]}", "none"]; result end .,., diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.24/src/servers_non_y2/drbd.rb.yy new/yast2-drbd-3.1.26/src/servers_non_y2/drbd.rb.yy --- old/yast2-drbd-3.1.24/src/servers_non_y2/drbd.rb.yy 2016-08-04 10:00:15.000000000 +0200 +++ new/yast2-drbd-3.1.26/src/servers_non_y2/drbd.rb.yy 2016-09-09 11:30:07.000000000 +0200 @@ -103,7 +103,7 @@ | conn_mesh_stmts conn_mesh_section { nk = val[1][0]; val[0][nk] = val[1][1]; return val[0]; } /* TK_HOSTS will generated automatically */ - conn_mesh_stmt: TK_HOSTS { return ["#{val[0]}", ""]; } + conn_mesh_stmt: TK_HOSTS { return ["#{val[0]}", "none"]; } conn_mesh_section: TK_NET '{' net_stmts '}' { return ["#{val[0]}", val[2]]; }
