Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2016-06-02 12:49:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-19 12:04:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2016-06-02 12:49:45.000000000 +0200 @@ -1,0 +2,35 @@ +Wed Jun 1 11:41:27 UTC 2016 - igonzalezsosa@suse.com + +- When importing SSH keys/configuration, only regular files + will be considered (bsc#982522) +- Force YaST2-Firstboot.service to run after + YaST2-Second-Stage.service (bsc#980365) +- 3.1.191 + +------------------------------------------------------------------- +Mon May 30 14:35:05 UTC 2016 - lslezak@suse.cz + +- Move the debugger invocation code to yast2-ruby-bindings package + to use the same implementation at run time (FATE#318421) +- 3.1.190 + +------------------------------------------------------------------- +Thu May 26 13:17:42 UTC 2016 - kanderssen@suse.com + +- System Role: centered dialog (ncurses). + +------------------------------------------------------------------- +Wed May 25 15:49:41 UTC 2016 - kanderssen@suse.com + +- More visual improvements in the SSH keys importing proposal + summary based on blog entry feedback. (Fate#319624) +- 3.1.189 + +------------------------------------------------------------------- +Wed May 25 13:07:59 UTC 2016 - lslezak@suse.cz + +- Start the Ruby debugger at the beginning of installation + when Y2DEBUGGER is set (FATE#318421) +- 3.1.188 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.187.tar.bz2 New: ---- yast2-installation-3.1.191.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.EVCAwn/_old 2016-06-02 12:49:46.000000000 +0200 +++ /var/tmp/diff_new_pack.EVCAwn/_new 2016-06-02 12:49:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.187 +Version: 3.1.191 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ YaST2-Firstboot.service ++++++ --- /var/tmp/diff_new_pack.EVCAwn/_old 2016-06-02 12:49:46.000000000 +0200 +++ /var/tmp/diff_new_pack.EVCAwn/_new 2016-06-02 12:49:46.000000000 +0200 @@ -1,6 +1,6 @@ [Unit] Description=YaST2 Firstboot -After=apparmor.service local-fs.target plymouth-start.service +After=apparmor.service local-fs.target plymouth-start.service YaST2-Second-Stage.service Before=getty@tty1.service serial-getty@ttyS0.service serial-getty@ttyS1.service serial-getty@ttyS2.service Before=display-manager.service network.service ConditionPathExists=/var/lib/YaST2/reconfig_system ++++++ yast2-installation-3.1.187.tar.bz2 -> yast2-installation-3.1.191.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/package/YaST2-Firstboot.service new/yast2-installation-3.1.191/package/YaST2-Firstboot.service --- old/yast2-installation-3.1.187/package/YaST2-Firstboot.service 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/package/YaST2-Firstboot.service 2016-06-01 14:02:48.000000000 +0200 @@ -1,6 +1,6 @@ [Unit] Description=YaST2 Firstboot -After=apparmor.service local-fs.target plymouth-start.service +After=apparmor.service local-fs.target plymouth-start.service YaST2-Second-Stage.service Before=getty@tty1.service serial-getty@ttyS0.service serial-getty@ttyS1.service serial-getty@ttyS2.service Before=display-manager.service network.service ConditionPathExists=/var/lib/YaST2/reconfig_system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/package/yast2-installation.changes new/yast2-installation-3.1.191/package/yast2-installation.changes --- old/yast2-installation-3.1.187/package/yast2-installation.changes 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/package/yast2-installation.changes 2016-06-01 14:02:48.000000000 +0200 @@ -1,4 +1,39 @@ ------------------------------------------------------------------- +Wed Jun 1 11:41:27 UTC 2016 - igonzalezsosa@suse.com + +- When importing SSH keys/configuration, only regular files + will be considered (bsc#982522) +- Force YaST2-Firstboot.service to run after + YaST2-Second-Stage.service (bsc#980365) +- 3.1.191 + +------------------------------------------------------------------- +Mon May 30 14:35:05 UTC 2016 - lslezak@suse.cz + +- Move the debugger invocation code to yast2-ruby-bindings package + to use the same implementation at run time (FATE#318421) +- 3.1.190 + +------------------------------------------------------------------- +Thu May 26 13:17:42 UTC 2016 - kanderssen@suse.com + +- System Role: centered dialog (ncurses). + +------------------------------------------------------------------- +Wed May 25 15:49:41 UTC 2016 - kanderssen@suse.com + +- More visual improvements in the SSH keys importing proposal + summary based on blog entry feedback. (Fate#319624) +- 3.1.189 + +------------------------------------------------------------------- +Wed May 25 13:07:59 UTC 2016 - lslezak@suse.cz + +- Start the Ruby debugger at the beginning of installation + when Y2DEBUGGER is set (FATE#318421) +- 3.1.188 + +------------------------------------------------------------------- Tue May 17 08:17:51 UTC 2016 - ancor@suse.com - Visual improvement in the SSH keys importing proposal summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/package/yast2-installation.spec new/yast2-installation-3.1.191/package/yast2-installation.spec --- old/yast2-installation-3.1.187/package/yast2-installation.spec 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/package/yast2-installation.spec 2016-06-01 14:02:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.187 +Version: 3.1.191 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/src/lib/installation/clients/inst_pre_install.rb new/yast2-installation-3.1.191/src/lib/installation/clients/inst_pre_install.rb --- old/yast2-installation-3.1.187/src/lib/installation/clients/inst_pre_install.rb 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/src/lib/installation/clients/inst_pre_install.rb 2016-06-01 14:02:48.000000000 +0200 @@ -94,6 +94,12 @@ read_ssh_info(device, mount_point) end + # The ssh_import proposal doesn't make sense if there is no + # configuration to import from. + if ::Installation::SshImporter.instance.configurations.empty? + ProductControl.DisableSubProposal("inst_initial", "ssh_import") + end + # free the memory @useful_partitions = nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/src/lib/installation/clients/installation.rb new/yast2-installation-3.1.191/src/lib/installation/clients/installation.rb --- old/yast2-installation-3.1.187/src/lib/installation/clients/installation.rb 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/src/lib/installation/clients/installation.rb 2016-06-01 14:02:48.000000000 +0200 @@ -30,6 +30,8 @@ # $Id$ module Yast class InstallationClient < Client + include Yast::Logger + def main textdomain "installation" @@ -37,12 +39,14 @@ Yast.import "Stage" Yast.import "Report" Yast.import "Hooks" + Yast.import "Linuxrc" Hooks.search_path.join!("installation") # Initialize the UI UI.SetProductLogo(true) Wizard.OpenLeftTitleNextBackDialog + Wizard.SetContents( # title "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/src/lib/installation/clients/ssh_import_proposal.rb new/yast2-installation-3.1.191/src/lib/installation/clients/ssh_import_proposal.rb --- old/yast2-installation-3.1.187/src/lib/installation/clients/ssh_import_proposal.rb 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/src/lib/installation/clients/ssh_import_proposal.rb 2016-06-01 14:02:48.000000000 +0200 @@ -38,7 +38,7 @@ def preformatted_proposal if importer.configurations.empty? - return _("No previous Linux installation found - not importing any SSH Key") + return Yast::HTML.List([_("No previous Linux installation found")]) end if importer.device.nil? res = _("No existing SSH host keys will be copied") @@ -55,8 +55,6 @@ res = _("SSH host keys will be copied from %s") % partition end end - # TRANSLATORS: link to change the proposal - res += " " + _("(<a href=%s>change</a>)") % '"ssh_import"' Yast::HTML.List([res]) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/src/lib/installation/dialogs/ssh_import.rb new/yast2-installation-3.1.191/src/lib/installation/dialogs/ssh_import.rb --- old/yast2-installation-3.1.187/src/lib/installation/dialogs/ssh_import.rb 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/src/lib/installation/dialogs/ssh_import.rb 2016-06-01 14:02:48.000000000 +0200 @@ -34,7 +34,7 @@ # Event callback for the 'ok' button def next_handler partition = UI.QueryWidget(Id(:device), :Value) - partition = nil if partition == :none + partition = nil unless UI.QueryWidget(Id(:import_ssh_key), :Value) copy_config = UI.QueryWidget(Id(:copy_config), :Value) log.info "SshImportDialog partition => #{partition} copy_config => #{copy_config}" importer.device = partition @@ -63,10 +63,25 @@ def dialog_content HSquash( VBox( - Left(Label(_("System to Import SSH Host Keys from"))), - partitions_list_widget, - VSpacing(1), - Left(copy_config_widget) + CheckBoxFrame( + Id(:import_ssh_key), + _("I would like to import SSH keys from a previous installation"), + true, + VBox( + HStretch(), + VSpacing(1), + HBox( + HSpacing(2), + partitions_list_widget + ), + VSpacing(3), + HBox( + HSpacing(2), + Left(copy_config_widget) + ) + ) + ), + HStretch() ) ) end @@ -82,7 +97,7 @@ "thus the identity- of its SSH server. The key files found in /etc/ssh " \ "(one pair of files per host key) will be copied to the new system " \ "being installed.</p>" \ - "<p>Check <b>Copy Whole SSH Configuration</b> to also copy other files " \ + "<p>Check <b>Import SSH Configuration</b> to also copy other files " \ "found in /etc/ssh, in addition to the keys.</p>" ) end @@ -96,8 +111,6 @@ RadioButtonGroup( Id(:device), VBox( - # TRANSLATORS: option to select no partition for SSH keys import - Left(RadioButton(Id(:none), _("None"), device.nil?)), *part_widgets ) ) @@ -112,7 +125,7 @@ end def copy_config_widget - CheckBox(Id(:copy_config), _("Copy Whole SSH Configuration"), copy_config) + CheckBox(Id(:copy_config), _("Import SSH Configuration"), copy_config) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/src/lib/installation/select_system_role.rb new/yast2-installation-3.1.191/src/lib/installation/select_system_role.rb --- old/yast2-installation-3.1.187/src/lib/installation/select_system_role.rb 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/src/lib/installation/select_system_role.rb 2016-06-01 14:02:48.000000000 +0200 @@ -53,10 +53,12 @@ end def dialog_content - VBox( - Left(Label(Yast::ProductControl.GetTranslatedText("roles_text"))), - VSpacing(2), - role_buttons + HSquash( + VBox( + Left(Label(Yast::ProductControl.GetTranslatedText("roles_text"))), + VSpacing(2), + role_buttons + ) ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/src/lib/installation/ssh_config.rb new/yast2-installation-3.1.191/src/lib/installation/ssh_config.rb --- old/yast2-installation-3.1.187/src/lib/installation/ssh_config.rb 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/src/lib/installation/ssh_config.rb 2016-06-01 14:02:48.000000000 +0200 @@ -110,7 +110,7 @@ # # @param dir [String] path of the SSH configuration directory def read_files(dir) - filenames = Dir.glob("#{dir}/*") + filenames = Dir.glob("#{dir}/*").select { |f| File.file?(f) } # Let's process keys first, pairs of files like "xyz" & "xyz.pub" pub_key_filenames = filenames.select { |f| f.end_with?(SshKey::PUBLIC_FILE_SUFFIX) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/test/fixtures/root1/etc/ssh/backup/README new/yast2-installation-3.1.191/test/fixtures/root1/etc/ssh/backup/README --- old/yast2-installation-3.1.187/test/fixtures/root1/etc/ssh/backup/README 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.191/test/fixtures/root1/etc/ssh/backup/README 2016-06-01 14:02:48.000000000 +0200 @@ -0,0 +1 @@ +Unexpected directory to check bsc#982522. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.187/test/ssh_config_test.rb new/yast2-installation-3.1.191/test/ssh_config_test.rb --- old/yast2-installation-3.1.187/test/ssh_config_test.rb 2016-05-18 11:28:09.000000000 +0200 +++ new/yast2-installation-3.1.191/test/ssh_config_test.rb 2016-06-01 14:02:48.000000000 +0200 @@ -108,6 +108,8 @@ Dir.glob("#{dir}/root1/etc/ssh/*").each do |file| if file.end_with?("_key") || file.end_with?("sshd_config") || file.end_with?("moduli") File.chmod(0600, file) + elsif File.directory?(file) + File.chmod(0755) else File.chmod(0644, file) end