Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-05-17 22:01:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-14 10:26:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-05-17 22:01:57.000000000 +0200 @@ -1,0 +2,26 @@ +Fri May 16 12:19:30 UTC 2014 - jsrain@suse.cz + +- reduced time-out for downloading release notes when behind + firewall (bnc#878265) +- 3.1.84 + +------------------------------------------------------------------- +Fri May 16 08:37:23 UTC 2014 - mvidner@suse.com + +- Fixed "undefined method" if an add-on has empty release notes URL + (bnc#877705) +- 3.1.83 + +------------------------------------------------------------------- +Fri May 16 07:11:52 UTC 2014 - jsrain@suse.cz + +- adjusted wording when deploying image to disk (bnc#877666) +- 3.1.82 + +------------------------------------------------------------------- +Wed May 14 11:10:05 UTC 2014 - jreidinger@suse.com + +- Use new bootloader API to set kernel parameters (bnc#869608) +- 3.1.81 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.80.tar.bz2 New: ---- yast2-installation-3.1.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.XFNWnn/_old 2014-05-17 22:01:59.000000000 +0200 +++ /var/tmp/diff_new_pack.XFNWnn/_new 2014-05-17 22:01:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.80 +Version: 3.1.84 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.80.tar.bz2 -> yast2-installation-3.1.84.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.80/package/yast2-installation.changes new/yast2-installation-3.1.84/package/yast2-installation.changes --- old/yast2-installation-3.1.80/package/yast2-installation.changes 2014-05-13 16:35:47.000000000 +0200 +++ new/yast2-installation-3.1.84/package/yast2-installation.changes 2014-05-16 14:30:44.000000000 +0200 @@ -1,4 +1,30 @@ ------------------------------------------------------------------- +Fri May 16 12:19:30 UTC 2014 - jsrain@suse.cz + +- reduced time-out for downloading release notes when behind + firewall (bnc#878265) +- 3.1.84 + +------------------------------------------------------------------- +Fri May 16 08:37:23 UTC 2014 - mvidner@suse.com + +- Fixed "undefined method" if an add-on has empty release notes URL + (bnc#877705) +- 3.1.83 + +------------------------------------------------------------------- +Fri May 16 07:11:52 UTC 2014 - jsrain@suse.cz + +- adjusted wording when deploying image to disk (bnc#877666) +- 3.1.82 + +------------------------------------------------------------------- +Wed May 14 11:10:05 UTC 2014 - jreidinger@suse.com + +- Use new bootloader API to set kernel parameters (bnc#869608) +- 3.1.81 + +------------------------------------------------------------------- Tue May 13 13:51:52 UTC 2014 - jreidinger@suse.com - Fix haveged path to kill it properly (patch by Ihno) (bnc#876876) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.80/package/yast2-installation.spec new/yast2-installation-3.1.84/package/yast2-installation.spec --- old/yast2-installation-3.1.80/package/yast2-installation.spec 2014-05-13 16:35:47.000000000 +0200 +++ new/yast2-installation-3.1.84/package/yast2-installation.spec 2014-05-16 14:30:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.80 +Version: 3.1.84 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.80/src/clients/inst_disk_for_image.rb new/yast2-installation-3.1.84/src/clients/inst_disk_for_image.rb --- old/yast2-installation-3.1.80/src/clients/inst_disk_for_image.rb 2014-05-13 16:35:47.000000000 +0200 +++ new/yast2-installation-3.1.84/src/clients/inst_disk_for_image.rb 2014-05-16 14:30:44.000000000 +0200 @@ -82,7 +82,7 @@ MarginBox(1, 0.5, VBox( Left(Label(_("Select the disk to deploy the image to."))), - Left(Label(_("All data on the disk will be destroyed!!!"))), + Left(Label(_("All data on the disk will be lost!!!"))), VSpacing(0.5), SelectionBox(Id(:disk), _("&Disk to Use"), disks_to_use) ) @@ -91,7 +91,7 @@ def disk_for_image_help_text _("Select the disk, which the image will be deployed to. " + - "All data on the disk will be destroyed and the disk will be " + + "All data on the disk will be lost and the disk will be " + "partitioned as defined in the image.") end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.80/src/clients/inst_download_release_notes.rb new/yast2-installation-3.1.84/src/clients/inst_download_release_notes.rb --- old/yast2-installation-3.1.80/src/clients/inst_download_release_notes.rb 2014-05-13 16:35:47.000000000 +0200 +++ new/yast2-installation-3.1.84/src/clients/inst_download_release_notes.rb 2014-05-16 14:30:44.000000000 +0200 @@ -78,6 +78,10 @@ } log.info("Products: #{products}") products.each do | product | + if InstData.stop_relnotes_download + log.info("Skipping release notes download due to previous download issues") + break + end if InstData.downloaded_release_notes.include? product["name"] log.info("Release notes for #{product['name']} already downloaded, skipping...") next @@ -86,7 +90,7 @@ log.debug("URL: #{url}") # protect from wrong urls if url.nil? || url.empty? - log.warning("Skipping invalid URL #{url} for product #{product['name']}") + log.warn("Skipping invalid URL #{url.inspect} for product #{product['name']}") next end pos = url.rindex("/") @@ -105,7 +109,7 @@ SCR.Read(path(".target.tmpdir"))) # download release notes now cmd = Builtins.sformat( - "/usr/bin/curl --location --verbose --fail --max-time 300 %1 '%2' --output '%3' > '%4/%5' 2>&1", + "/usr/bin/curl --location --verbose --fail --max-time 300 --connect-timeout 15 %1 '%2' --output '%3' > '%4/%5' 2>&1", proxy, url, String.Quote(filename), @@ -119,6 +123,10 @@ InstData.release_notes[product["name"]] = SCR.Read(path(".target.string"), filename) InstData.downloaded_release_notes << product["name"] break + elsif ret == 7 + log.info "Communication with server for release notes download failed, skipping further attempts." + InstData.stop_relnotes_download = true + break end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.80/src/lib/installation/cio_ignore.rb new/yast2-installation-3.1.84/src/lib/installation/cio_ignore.rb --- old/yast2-installation-3.1.80/src/lib/installation/cio_ignore.rb 2014-05-13 16:35:47.000000000 +0200 +++ new/yast2-installation-3.1.84/src/lib/installation/cio_ignore.rb 2014-05-16 14:30:44.000000000 +0200 @@ -165,8 +165,7 @@ res = Yast::Bootloader.Read - # API is not much intuitive, see Yast::Bootloader.setKernelParam for details - res &&= Yast::Bootloader.setKernelParam("DEFAULT", "cio_ignore", "all,!ipldev,!condev") + res &&= Yast::Bootloader.modify_kernel_params("cio_ignore" => "all,!ipldev,!condev") res &&= Yast::Bootloader.Write diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.80/src/modules/InstData.rb new/yast2-installation-3.1.84/src/modules/InstData.rb --- old/yast2-installation-3.1.80/src/modules/InstData.rb 2014-05-13 16:35:47.000000000 +0200 +++ new/yast2-installation-3.1.84/src/modules/InstData.rb 2014-05-16 14:30:44.000000000 +0200 @@ -100,6 +100,10 @@ # only product names, not the actual RN text @downloaded_release_notes = [] + # remember that downloading release notes failed due to communication + # issues with the server, avoid further attempts then + @stop_relnotes_download = false + # EOF end @@ -119,6 +123,7 @@ publish :variable => :image_target_disk, :type => "string" publish :variable => :release_notes, :type => "map<string,string>" publish :variable => :downloaded_release_notes, :type => "list<string>" + publish :variable => :stop_relnotes_download, :type => "boolean" end InstData = InstDataClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.80/test/cio_ignore_test.rb new/yast2-installation-3.1.84/test/cio_ignore_test.rb --- old/yast2-installation-3.1.80/test/cio_ignore_test.rb 2014-05-13 16:35:47.000000000 +0200 +++ new/yast2-installation-3.1.84/test/cio_ignore_test.rb 2014-05-16 14:30:44.000000000 +0200 @@ -110,7 +110,7 @@ allow(Yast::Bootloader).to receive(:Write) { true } allow(Yast::Bootloader).to receive(:Read) { true } - allow(Yast::Bootloader).to receive(:setKernelParam) { true } + allow(Yast::Bootloader).to receive(:modify_kernel_params) { true } allow(Yast::SCR).to receive(:Execute). once. @@ -162,8 +162,8 @@ it "adds kernel parameters IPLDEV and CONDEV to the bootloader" do expect(Yast::Bootloader).to receive(:Write).once { true } expect(Yast::Bootloader).to receive(:Read).once { true } - expect(Yast::Bootloader).to receive(:setKernelParam).once. - with("DEFAULT", "cio_ignore", /all/).and_return(true) + expect(Yast::Bootloader).to receive(:modify_kernel_params).once. + and_return(true) subject.run("Write") end @@ -171,8 +171,8 @@ it "raises an exception if modifying kernel parameters failed" do expect(Yast::Bootloader).to receive(:Write).never expect(Yast::Bootloader).to receive(:Read).once { true } - allow(Yast::Bootloader).to receive(:setKernelParam).once. - with("DEFAULT", "cio_ignore", /all/).and_return(false) + allow(Yast::Bootloader).to receive(:modify_kernel_params).once. + and_return(false) expect{subject.run("Write")}.to raise_error(RuntimeError, /failed to write kernel parameters/) end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org