commit yast2-packager for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2015-12-27 01:58:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2015-10-28 17:18:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2015-12-27 01:58:27.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Dec 22 10:02:21 UTC 2015 - jsrain@suse.cz + +- read release notes from media of manually added extension + (bsc#957241) +- 3.1.86 + +------------------------------------------------------------------- +Mon Dec 21 13:13:47 UTC 2015 - lslezak@suse.cz + +- Removed leftover closing rich text tag (bsc#950866) +- 3.1.85 + +------------------------------------------------------------------- +Wed Dec 16 13:03:07 UTC 2015 - lslezak@suse.cz + +- Do not remove the system repository when adding an addon fails, + better handle errors (bsc#956597) +- 3.1.84 + +------------------------------------------------------------------- +Wed Nov 11 15:48:33 UTC 2015 - lslezak@suse.cz + +- Do not check the free space on a CD/DVD mounted medium during + online migration (the mount point has been changed from /media to + /run/media) (bsc#952112) + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.83.tar.bz2 New: ---- yast2-packager-3.1.86.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.4plAX1/_old 2015-12-27 01:58:29.000000000 +0100 +++ /var/tmp/diff_new_pack.4plAX1/_new 2015-12-27 01:58:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.83 +Version: 3.1.86 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.83.tar.bz2 -> yast2-packager-3.1.86.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.83/package/yast2-packager.changes new/yast2-packager-3.1.86/package/yast2-packager.changes --- old/yast2-packager-3.1.83/package/yast2-packager.changes 2015-10-22 10:38:08.000000000 +0200 +++ new/yast2-packager-3.1.86/package/yast2-packager.changes 2015-12-23 10:33:10.000000000 +0100 @@ -1,4 +1,31 @@ ------------------------------------------------------------------- +Tue Dec 22 10:02:21 UTC 2015 - jsrain@suse.cz + +- read release notes from media of manually added extension + (bsc#957241) +- 3.1.86 + +------------------------------------------------------------------- +Mon Dec 21 13:13:47 UTC 2015 - lslezak@suse.cz + +- Removed leftover closing rich text tag (bsc#950866) +- 3.1.85 + +------------------------------------------------------------------- +Wed Dec 16 13:03:07 UTC 2015 - lslezak@suse.cz + +- Do not remove the system repository when adding an addon fails, + better handle errors (bsc#956597) +- 3.1.84 + +------------------------------------------------------------------- +Wed Nov 11 15:48:33 UTC 2015 - lslezak@suse.cz + +- Do not check the free space on a CD/DVD mounted medium during + online migration (the mount point has been changed from /media to + /run/media) (bsc#952112) + +------------------------------------------------------------------- Wed Oct 21 14:29:50 UTC 2015 - lslezak@suse.cz - fixed crash (missing nil check) at ProductLicense.rb when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.83/package/yast2-packager.spec new/yast2-packager-3.1.86/package/yast2-packager.spec --- old/yast2-packager-3.1.83/package/yast2-packager.spec 2015-10-22 10:38:08.000000000 +0200 +++ new/yast2-packager-3.1.86/package/yast2-packager.spec 2015-12-23 10:33:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.83 +Version: 3.1.86 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.83/src/include/packager/repositories_include.rb new/yast2-packager-3.1.86/src/include/packager/repositories_include.rb --- old/yast2-packager-3.1.83/src/include/packager/repositories_include.rb 2015-10-22 10:38:08.000000000 +0200 +++ new/yast2-packager-3.1.86/src/include/packager/repositories_include.rb 2015-12-23 10:33:10.000000000 +0100 @@ -462,12 +462,17 @@ ret = createSource(url, plaindir, @download_meta, name) - if ret == :again - return :back - elsif ret == :abort - return :abort + case ret + when :again + :back + when :abort, :cancel + :abort + when :next + :next + else + log.warn "Received unknown result: #{ret}, using :next instead" + :next end - :next end def TypeDialogOpts(download, url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.83/src/modules/AddOnProduct.rb new/yast2-packager-3.1.86/src/modules/AddOnProduct.rb --- old/yast2-packager-3.1.83/src/modules/AddOnProduct.rb 2015-10-22 10:38:08.000000000 +0200 +++ new/yast2-packager-3.1.86/src/modules/AddOnProduct.rb 2015-12-23 10:33:10.000000000 +0100 @@ -49,6 +49,8 @@ Yast.import "PackagesProposal" Yast.import "SourceManager" + Yast.include self, "packager/load_release_notes.rb" + # variables for installation with product # ID for cache in the inst-sys @src_cache_id = -1 @@ -1146,6 +1148,28 @@ nil end + def IntegrateReleaseNotes(repo_id) + products = Pkg.ResolvableProperties("", :product, ""). select do |product| + product["source"] = repo_id + end + product_name = products[0]["short_name"] || _("Unknown Product") + Builtins.y2milestone("Integrating release notes for product %1", product_name) + + WFM.CallFunction("inst_download_release_notes") + # fallback - RN from media + if InstData.release_notes[product_name].nil? + Builtins.y2milestone("Getting on-line release notes failed, getting them from media") + if load_release_notes(repo_id) + # push button + Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "rel_notes") + InstData.release_notes[product_name] = @media_text + UI::SetReleaseNotes(InstData.release_notes) + else + Builtins.y2error("Release notes not found on media.") + end + end + end + # Integrate the add-on product to the installation workflow, including # preparations for 2nd stage and inst-sys update # @param [Fixnum] srcid integer the ID of the repository @@ -1174,6 +1198,9 @@ # Adds workflow to the Workflow Store if any workflow exists WorkflowManager.AddWorkflow(:addon, srcid, "") + # Adjust the release notes - display RN from add-ons during installation + IntegrateReleaseNotes(srcid) if Stage.initial + true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.83/src/modules/Packages.rb new/yast2-packager-3.1.86/src/modules/Packages.rb --- old/yast2-packager-3.1.83/src/modules/Packages.rb 2015-10-22 10:38:08.000000000 +0200 +++ new/yast2-packager-3.1.86/src/modules/Packages.rb 2015-12-23 10:33:10.000000000 +0100 @@ -731,7 +731,7 @@ # (just warn if removed by user or by YaST) msg = (transact_by == :user || transact_by == :app_high) ? _("<b>Warning:</b> Product <b>%s</b> will be removed.") % h(product_label(product)) : - _("<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>") \ + _("<b>Error:</b> Product <b>%s</b> will be automatically removed.") \ % h(product_label(product)) HTML.Colorize(msg, "red") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.83/src/modules/SpaceCalculation.rb new/yast2-packager-3.1.86/src/modules/SpaceCalculation.rb --- old/yast2-packager-3.1.83/src/modules/SpaceCalculation.rb 2015-10-22 10:38:08.000000000 +0200 +++ new/yast2-packager-3.1.86/src/modules/SpaceCalculation.rb 2015-12-23 10:33:10.000000000 +0100 @@ -142,6 +142,7 @@ mountName != "/dev/shm" && part["spec"] != "udev" && !mountName.start_with?("/media/") && + !mountName.start_with?("/run/media/") && !mountName.start_with?("/var/adm/mount/") part_info["name"] = mountName end
participants (1)
-
root@hilbert.suse.de