Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2020-06-14 18:15:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation" Sun Jun 14 18:15:46 2020 rev:447 rq:814192 version:4.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2020-06-11 14:44:39.537374979 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.3606/yast2-installation.changes 2020-06-14 18:15:51.454943597 +0200 @@ -1,0 +2,13 @@ +Fri Jun 12 16:09:32 UTC 2020 - David Diaz <[email protected]> + +- Improve the UX of the Previously Used Repositories dialog by + using more accurate labels. + +------------------------------------------------------------------- + +Fri Jun 12 15:03:11 UTC 2020 - Josef Reidinger <[email protected]> + +- Remove ssh_import section from AY when cloning (bsc#1172749) +- 4.3.3 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.3.2.tar.bz2 New: ---- yast2-installation-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.NDfrir/_old 2020-06-14 18:15:52.786947015 +0200 +++ /var/tmp/diff_new_pack.NDfrir/_new 2020-06-14 18:15:52.790947025 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.3.2 +Version: 4.3.3 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only ++++++ yast2-installation-4.3.2.tar.bz2 -> yast2-installation-4.3.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.2/package/yast2-installation.changes new/yast2-installation-4.3.3/package/yast2-installation.changes --- old/yast2-installation-4.3.2/package/yast2-installation.changes 2020-06-10 17:14:19.000000000 +0200 +++ new/yast2-installation-4.3.3/package/yast2-installation.changes 2020-06-12 18:23:27.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Jun 12 16:09:32 UTC 2020 - David Diaz <[email protected]> + +- Improve the UX of the Previously Used Repositories dialog by + using more accurate labels. + +------------------------------------------------------------------- + +Fri Jun 12 15:03:11 UTC 2020 - Josef Reidinger <[email protected]> + +- Remove ssh_import section from AY when cloning (bsc#1172749) +- 4.3.3 + +------------------------------------------------------------------- Wed Jun 10 12:43:33 UTC 2020 - Ladislav Slezák <[email protected]> - Fixed yupdate script to correctly install the needed Ruby gems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.2/package/yast2-installation.spec new/yast2-installation-4.3.3/package/yast2-installation.spec --- old/yast2-installation-4.3.2/package/yast2-installation.spec 2020-06-10 17:14:19.000000000 +0200 +++ new/yast2-installation-4.3.3/package/yast2-installation.spec 2020-06-12 18:23:27.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.3.2 +Version: 4.3.3 Release: 0 Group: System/YaST License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.2/src/lib/installation/clients/inst_upgrade_urls.rb new/yast2-installation-4.3.3/src/lib/installation/clients/inst_upgrade_urls.rb --- old/yast2-installation-4.3.2/src/lib/installation/clients/inst_upgrade_urls.rb 2020-06-10 17:14:19.000000000 +0200 +++ new/yast2-installation-4.3.3/src/lib/installation/clients/inst_upgrade_urls.rb 2020-06-12 18:23:27.000000000 +0200 @@ -31,6 +31,7 @@ Yast.import "Stage" Yast.import "UI" Yast.import "Wizard" +Yast.import "String" module Yast # This client allows reusing the old repositories during system upgrade. @@ -115,7 +116,7 @@ Opt(:notify, :keepSorting), Header( # TRANSLATORS: Table header item - _("Current Status"), + _("Action"), # TRANSLATORS: Table header item _("Repository"), # TRANSLATORS: Table header item @@ -126,24 +127,15 @@ Left( HBox( # TRANSLATORS: Push button - PushButton(Id(:edit), _("&Change...")), + PushButton(Id(:edit), edit_button_label), HSpacing(1), # TRANSLATORS: Push button - PushButton(Id(:toggle), _("&Toggle Status")), + PushButton(Id(:toggle), toggle_button_label), HStretch() ) ) ), - # TRANSLATORS: help text 1/3 - _( - "<p>Here you see all software repositories found\non the system you are upgrading. Enable the ones you want to include in the upgrade process.</p>" - ) + - # TRANSLATORS: help text 2/3 - _( - "<p>To enable, remove or disable an URL, click the\n<b>Toggle Status</b> button or double-click the respective table item.</p>" - ) + - # TRANSLATORS: help text 3/3 - _("<p>To change the URL, click the <b>Change...</b> button.</p>"), + help_text, true, true ) @@ -151,30 +143,50 @@ nil end - def translated_repo_status(status) + # Translated repository action, based on its status + # + # @param status [Symbol] the repository status + # @return [String] the action to perform with a repository + def repo_action(status) case status when :removed - # TRANSLATORS: The repository status - _("Removed") - when :disabled - # TRANSLATORS: The repository status - _("Disabled") - when :enabled - # TRANSLATORS: The repository status - _("Enabled") + # TRANSLATORS: The action to perform with a repository + _("Remove") + when :disable + # TRANSLATORS: The action to perform with a repository + _("Disable") + when :enable + # TRANSLATORS: The action to perform with a repository + _("Enable") else - # TRANSLATORS: The repository status is unknown - _("Unknown") + # TRANSLATORS: The action to perform with a repository + _("Keep") end end + # Returns the label for the toggle button + # + # @return [String] + def toggle_button_label + # TRANSLATORS: the "Toggle Action" button label + _("&Toggle Action") + end + + # Returns the label for the change url button + # + # @return [String] + def edit_button_label + # TRANSLATORS: the "Change URL" button label + _("&Change URL...") + end + def refresh_dialog current_item = UI.QueryWidget(Id("table_of_repos"), :CurrentItem) items = repo_manager.repositories.map do |r| Item( Id(r.repo_alias), - translated_repo_status(repo_manager.repo_status(r)), + repo_action(repo_manager.repo_status(r)), r.name, repo_manager.repo_url(r) ) @@ -296,5 +308,27 @@ def test? ENV["YAST_TEST"] == "1" end + + # Returns the help text for the dialog + # + # @return [String] + def help_text + [ + # TRANSLATORS: help text 1/3 + _("<p>Here you see all software repositories found on the system you are upgrading. " \ + "Enable the ones you want to include in the upgrade process.</p>"), + # TRANSLATORS: help text 2/3, %{toggle_action} is replaced by the button label + format( + _("<p>To enable, remove or disable an URL, click the <b>%{toggle_action}</b> button " \ + "or double-click the respective table item.</p>"), + toggle_action: Yast::String.RemoveShortcut(toggle_button_label) + ), + # TRANSLATORS: help text 3/3, %{change_url} is replaced by the button label + format( + _("<p>To change the URL, click the <b>%{change_url}</b> button.</p>"), + change_url: Yast::String.RemoveShortcut(edit_button_label) + ) + ].join + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.2/src/lib/installation/clients/ssh_import_auto.rb new/yast2-installation-4.3.3/src/lib/installation/clients/ssh_import_auto.rb --- old/yast2-installation-4.3.2/src/lib/installation/clients/ssh_import_auto.rb 2020-06-10 17:14:19.000000000 +0200 +++ new/yast2-installation-4.3.3/src/lib/installation/clients/ssh_import_auto.rb 2020-06-12 18:23:27.000000000 +0200 @@ -107,8 +107,8 @@ # That's are default entries. def export ret = {} + # Taking values from AutoYast configuration module, otherwise do not export (bsc#1172749) if Mode.config - # Taking values from AutoYast configuration module if ssh_importer.device && !ssh_importer.device.empty? ret["import"] = true ret["copy_config"] = ssh_importer.copy_config @@ -119,13 +119,6 @@ ret["import"] = false ret["copy_config"] = false end - else - # Taking default values - ret = { "import" => true, "copy_config" => false } - # Device will not be set because it is optional and the - # most-recently-accessed device (biggest keys_atime) - # will be used for. - # ret["device"] = device end ret end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.3.2/test/ssh_import_auto_test.rb new/yast2-installation-4.3.3/test/ssh_import_auto_test.rb --- old/yast2-installation-4.3.2/test/ssh_import_auto_test.rb 2020-06-10 17:14:19.000000000 +0200 +++ new/yast2-installation-4.3.3/test/ssh_import_auto_test.rb 2020-06-12 18:23:27.000000000 +0200 @@ -25,8 +25,23 @@ context "Export" do let(:func) { "Export" } - it "returns a hash with default configuration" do - expect(subject.run).to eq("copy_config" => false, "import" => true) + context "config mode" do + let(:mode) { "autoinst_config" } + + it "returns a hash with configuration" do + importer.add_config(fixtures_dir("root1"), "dev") + expect(subject.run).to eq( + "copy_config" => false, + "device" => "dev", + "import" => true + ) + end + end + + context "other modes" do + it "returns an empty hash" do + expect(subject.run).to eq({}) + end end end
