Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2014-07-19 11:05:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2014-07-11 20:05:30.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2014-07-19 11:05:27.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Jul 16 09:15:10 UTC 2014 - jsr...@suse.cz
+
+- retranslate release notes button when going back in workflow
+ (bnc#886660)
+- 3.1.101
+
+-------------------------------------------------------------------
+Tue Jul 15 15:44:41 CEST 2014 - loci...@suse.com
+
+- Asking user for confirmation while aborting the installation in
+ disk activation dialog (bnc#886662)
+- 3.1.100
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.99.tar.bz2
New:
----
yast2-installation-3.1.101.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.bxLjFc/_old 2014-07-19 11:05:28.000000000 +0200
+++ /var/tmp/diff_new_pack.bxLjFc/_new 2014-07-19 11:05:28.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.99
+Version: 3.1.101
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-installation-3.1.99.tar.bz2 -> yast2-installation-3.1.101.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.99/package/yast2-installation.changes
new/yast2-installation-3.1.101/package/yast2-installation.changes
--- old/yast2-installation-3.1.99/package/yast2-installation.changes
2014-07-04 11:05:31.000000000 +0200
+++ new/yast2-installation-3.1.101/package/yast2-installation.changes
2014-07-17 10:44:52.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Wed Jul 16 09:15:10 UTC 2014 - jsr...@suse.cz
+
+- retranslate release notes button when going back in workflow
+ (bnc#886660)
+- 3.1.101
+
+-------------------------------------------------------------------
+Tue Jul 15 15:44:41 CEST 2014 - loci...@suse.com
+
+- Asking user for confirmation while aborting the installation in
+ disk activation dialog (bnc#886662)
+- 3.1.100
+
+-------------------------------------------------------------------
Fri Jul 4 08:48:03 UTC 2014 - jreidin...@suse.com
- Copy multipath blacklist to target system (bnc#885628)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.99/package/yast2-installation.spec
new/yast2-installation-3.1.101/package/yast2-installation.spec
--- old/yast2-installation-3.1.99/package/yast2-installation.spec
2014-07-04 11:05:31.000000000 +0200
+++ new/yast2-installation-3.1.101/package/yast2-installation.spec
2014-07-17 10:44:52.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.99
+Version: 3.1.101
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.99/src/clients/inst_complex_welcome.rb
new/yast2-installation-3.1.101/src/clients/inst_complex_welcome.rb
--- old/yast2-installation-3.1.99/src/clients/inst_complex_welcome.rb
2014-07-04 11:05:31.000000000 +0200
+++ new/yast2-installation-3.1.101/src/clients/inst_complex_welcome.rb
2014-07-17 10:44:52.000000000 +0200
@@ -224,6 +224,12 @@
UI.ChangeWidget(Id(:keyboard), :Value, @kbd)
end
+ # In case of going back, Release Notes button may be shown, retranslate
it (bnc#886660)
+ # Assure that relnotes have been downloaded first
+ if ! InstData.release_notes.empty?
+ Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes")
+ end
+
# Get the user input.
#
@ret = nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.99/src/clients/inst_disks_activate.rb
new/yast2-installation-3.1.101/src/clients/inst_disks_activate.rb
--- old/yast2-installation-3.1.99/src/clients/inst_disks_activate.rb
2014-07-04 11:05:31.000000000 +0200
+++ new/yast2-installation-3.1.101/src/clients/inst_disks_activate.rb
2014-07-17 10:44:52.000000000 +0200
@@ -101,7 +101,6 @@
missing_part
end
-
@contents = HBox(
HWeight(999, HStretch()),
VBox(
@@ -116,20 +115,12 @@
HWeight(999, HStretch())
)
- Wizard.SetContents(
- @caption,
- @contents,
- @help,
- GetInstArgs.enable_back,
- GetInstArgs.enable_next
- )
- Wizard.SetTitleIcon("disk")
- Wizard.SetFocusToNextButton
-
- @ret = nil
@disks_changed = false
- while @ret == nil
+
+ while @ret.nil?
+ show_base_dialog
@ret = UI.UserInput
+
case @ret
when :dasd
WFM.call("inst_dasd")
@@ -146,21 +137,14 @@
when :network
WFM.call("inst_lan", [@argmap.merge({"skip_detection" => true})])
@ret = :redraw
+ when :abort
+ @ret = nil if Popup.ConfirmAbort(:painless)
end
+
if @ret == :redraw
@disks_changed = true
- Wizard.SetContents(
- @caption,
- @contents,
- @help,
- GetInstArgs.enable_back,
- GetInstArgs.enable_next
- )
- Wizard.SetTitleIcon("disk")
- Wizard.SetFocusToNextButton
@ret = nil
end
- RestoreButtons(GetInstArgs.enable_back, GetInstArgs.enable_next)
end
if @have_dasd && @ret == :next
@@ -185,6 +169,20 @@
private
+ def show_base_dialog
+ Wizard.SetContents(
+ @caption,
+ @contents,
+ @help,
+ GetInstArgs.enable_back,
+ GetInstArgs.enable_next
+ )
+
+ Wizard.SetTitleIcon("disk")
+ RestoreButtons(GetInstArgs.enable_back, GetInstArgs.enable_next)
+ Wizard.SetFocusToNextButton
+ end
+
def button(id, title)
HWeight(
1,
@@ -204,16 +202,9 @@
Wizard.RestoreAbortButton
Wizard.RestoreNextButton
Wizard.RestoreBackButton
- if enable_back
- Wizard.EnableBackButton
- else
- Wizard.DisableBackButton
- end
- if enable_next
- Wizard.EnableNextButton
- else
- Wizard.DisableNextButton
- end
+
+ enable_back ? Wizard.EnableBackButton : Wizard.DisableBackButton
+ enable_next ? Wizard.EnableNextButton : Wizard.DisableNextButton
end
end
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
