Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2016-11-12 12:59:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-03 12:56:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2016-11-12 12:59:38.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 11 13:50:06 UTC 2016 - jreidinger@suse.com + +- Do not crash if importing ssh config from system which + /etc/os-release does not contain pretty name (bsc#1009492) +- 3.2.7 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.2.6.tar.bz2 New: ---- yast2-installation-3.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.r9R1CY/_old 2016-11-12 12:59:40.000000000 +0100 +++ /var/tmp/diff_new_pack.r9R1CY/_new 2016-11-12 12:59:40.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.2.6 +Version: 3.2.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.2.6.tar.bz2 -> yast2-installation-3.2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.6/package/yast2-installation.changes new/yast2-installation-3.2.7/package/yast2-installation.changes --- old/yast2-installation-3.2.6/package/yast2-installation.changes 2016-11-02 11:00:06.000000000 +0100 +++ new/yast2-installation-3.2.7/package/yast2-installation.changes 2016-11-11 15:06:14.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 11 13:50:06 UTC 2016 - jreidinger@suse.com + +- Do not crash if importing ssh config from system which + /etc/os-release does not contain pretty name (bsc#1009492) +- 3.2.7 + +------------------------------------------------------------------- Mon Oct 31 13:23:38 UTC 2016 - lslezak@suse.cz - Added support for read-only proposal modules (fate#321739) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.6/package/yast2-installation.spec new/yast2-installation-3.2.7/package/yast2-installation.spec --- old/yast2-installation-3.2.6/package/yast2-installation.spec 2016-11-02 11:00:06.000000000 +0100 +++ new/yast2-installation-3.2.7/package/yast2-installation.spec 2016-11-11 15:06:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.2.6 +Version: 3.2.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.6/src/lib/installation/ssh_config.rb new/yast2-installation-3.2.7/src/lib/installation/ssh_config.rb --- old/yast2-installation-3.2.6/src/lib/installation/ssh_config.rb 2016-11-02 11:00:06.000000000 +0100 +++ new/yast2-installation-3.2.7/src/lib/installation/ssh_config.rb 2016-11-11 15:06:15.000000000 +0100 @@ -65,9 +65,9 @@ os_release = parse_ini_file(os_release_file(mount_point)) name = os_release["PRETTY_NAME"] - if name.empty? - name = os_release[NAME] || default_name - name += " #{os_release[VERSION]}" + if !name || name.empty? + name = os_release["NAME"] || default_name + name += " #{os_release["VERSION"]}" end name rescue Errno::ENOENT # No /etc/os-release found @@ -85,6 +85,7 @@ line = line.lstrip.chomp next if line.empty? || line.start_with?("#") (key, value) = line.split("=") + key.rstrip! value.gsub!(/^\s*"/, "") value.gsub!(/"\s*$/, "") content[key] = value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.6/test/fixtures/root3/etc/os-release new/yast2-installation-3.2.7/test/fixtures/root3/etc/os-release --- old/yast2-installation-3.2.6/test/fixtures/root3/etc/os-release 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.2.7/test/fixtures/root3/etc/os-release 2016-11-11 15:06:15.000000000 +0100 @@ -0,0 +1,2 @@ +NAME = "SUSE" +VERSION = "10" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.2.6/test/ssh_config_test.rb new/yast2-installation-3.2.7/test/ssh_config_test.rb --- old/yast2-installation-3.2.6/test/ssh_config_test.rb 2016-11-02 11:00:06.000000000 +0100 +++ new/yast2-installation-3.2.7/test/ssh_config_test.rb 2016-11-11 15:06:15.000000000 +0100 @@ -30,6 +30,7 @@ let(:old_root1_atime) { Time.now - 60 } let(:root1_dir) { FIXTURES_DIR.join("root1") } let(:root2_dir) { FIXTURES_DIR.join("root2") } + let(:root3_dir) { FIXTURES_DIR.join("root3") } before do # The ssh_host private key file is more recent than any other file @@ -48,6 +49,11 @@ expect(root2.system_name).to eq _("Linux") end + it "uses name and version when PRETTY_NAME is missing in /etc/os-release" do + root3 = described_class.from_dir(root3_dir) + expect(root3.system_name).to eq _("SUSE 10") + end + it "stores all the keys and files with their names" do root1 = described_class.from_dir(root1_dir) root2 = described_class.from_dir(root2_dir)