commit yast2-drbd for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-drbd for openSUSE:Factory checked in at 2014-09-09 19:00:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-02 15:05:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-drbd.new/yast2-drbd.changes 2014-09-09 19:00:42.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 9 08:58:07 UTC 2014 - nwang@suse.com + +- BNC#460178. Exit directly if no any modification. +- Version 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-drbd-3.1.5.tar.bz2 New: ---- yast2-drbd-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-drbd.spec ++++++ --- /var/tmp/diff_new_pack.H3brEv/_old 2014-09-09 19:00:46.000000000 +0200 +++ /var/tmp/diff_new_pack.H3brEv/_new 2014-09-09 19:00:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-drbd-3.1.5.tar.bz2 -> yast2-drbd-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.5/package/yast2-drbd.changes new/yast2-drbd-3.1.6/package/yast2-drbd.changes --- old/yast2-drbd-3.1.5/package/yast2-drbd.changes 2014-07-01 09:37:19.000000000 +0200 +++ new/yast2-drbd-3.1.6/package/yast2-drbd.changes 2014-09-09 11:02:22.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 9 08:58:07 UTC 2014 - nwang@suse.com + +- BNC#460178. Exit directly if no any modification. +- Version 3.1.6 + +------------------------------------------------------------------- Tue Jul 1 07:32:09 UTC 2014 - nwang@suse.com - BNC#884689 and BNC#812061. Enhance the help text. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.5/package/yast2-drbd.spec new/yast2-drbd-3.1.6/package/yast2-drbd.spec --- old/yast2-drbd-3.1.5/package/yast2-drbd.spec 2014-07-01 09:37:19.000000000 +0200 +++ new/yast2-drbd-3.1.6/package/yast2-drbd.spec 2014-09-09 11:02:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-drbd -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.5/src/include/drbd/common.rb new/yast2-drbd-3.1.6/src/include/drbd/common.rb --- old/yast2-drbd-3.1.5/src/include/drbd/common.rb 2014-07-01 09:37:20.000000000 +0200 +++ new/yast2-drbd-3.1.6/src/include/drbd/common.rb 2014-09-09 11:02:22.000000000 +0200 @@ -53,9 +53,13 @@ UI.PollInput == :abort end + def Modified + Drbd.modified + end + def ReallyAbort # return !Heartbeat::Modified() || Popup::ReallyAbort(true); - Popup.ReallyAbort(true) + !Modified() || Popup.ReallyAbort(true) end def my_SetContents(conf, contents) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.5/src/include/drbd/global_conf.rb new/yast2-drbd-3.1.6/src/include/drbd/global_conf.rb --- old/yast2-drbd-3.1.5/src/include/drbd/global_conf.rb 2014-07-01 09:37:20.000000000 +0200 +++ new/yast2-drbd-3.1.6/src/include/drbd/global_conf.rb 2014-09-09 11:02:22.000000000 +0200 @@ -110,6 +110,7 @@ if ret == "DialogRefresh" || ret == "MinorCount" || ret == "DisableIpVerification" + Drbd.modified = true next end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.5/src/include/drbd/resource_conf.rb new/yast2-drbd-3.1.6/src/include/drbd/resource_conf.rb --- old/yast2-drbd-3.1.5/src/include/drbd/resource_conf.rb 2014-07-01 09:37:20.000000000 +0200 +++ new/yast2-drbd-3.1.6/src/include/drbd/resource_conf.rb 2014-09-09 11:02:22.000000000 +0200 @@ -548,6 +548,8 @@ next end + Drbd.modified = true + Builtins.foreach( [ :resname, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-drbd-3.1.5/src/modules/Drbd.rb new/yast2-drbd-3.1.6/src/modules/Drbd.rb --- old/yast2-drbd-3.1.5/src/modules/Drbd.rb 2014-07-01 09:37:20.000000000 +0200 +++ new/yast2-drbd-3.1.6/src/modules/Drbd.rb 2014-09-09 11:02:22.000000000 +0200 @@ -473,7 +473,9 @@ # DRBD write dialog caption caption = _("Writing DRBD Configuration") - #if (!modified) return true; + # Comment code below due to change the "booting" status + # won't change modified flag + #return true if !@modified # We do not set help text here, because it was set outside Progress.New( -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de