Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at 2018-01-28 00:37:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2"
Sun Jan 28 00:37:26 2018 rev:230 rq:569344 version:4.0.24
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2018-01-17
21:44:31.801907097 +0100
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2018-01-28
00:37:28.202984101 +0100
@@ -1,0 +2,20 @@
+Wed Jan 24 16:20:01 CET 2018 - sch...@suse.de
+
+- Selecting evaluated/given product for installation.
+ fate#323450
+- 4.0.24
+
+-------------------------------------------------------------------
+Fri Jan 19 14:02:32 UTC 2018 - lsle...@suse.cz
+
+- Display more details when the package solver fails
+
+-------------------------------------------------------------------
+Thu Jan 18 14:37:15 CET 2018 - sch...@suse.de
+
+- Using ProductFeatures.SetSection instead of
+ ProductFeatures.SetOverlay in order to set product features.
+ This is a follow up of bsc#1070726.
+- 4.0.23
+
+-------------------------------------------------------------------
Old:
----
autoyast2-4.0.22.tar.bz2
New:
----
autoyast2-4.0.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.vQUuGR/_old 2018-01-28 00:37:28.842954288 +0100
+++ /var/tmp/diff_new_pack.vQUuGR/_new 2018-01-28 00:37:28.850953914 +0100
@@ -22,7 +22,7 @@
%endif
Name: autoyast2
-Version: 4.0.22
+Version: 4.0.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ autoyast2-4.0.22.tar.bz2 -> autoyast2-4.0.24.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.0.22/package/autoyast2.changes
new/autoyast2-4.0.24/package/autoyast2.changes
--- old/autoyast2-4.0.22/package/autoyast2.changes 2018-01-17
15:44:43.000000000 +0100
+++ new/autoyast2-4.0.24/package/autoyast2.changes 2018-01-24
16:46:07.000000000 +0100
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Wed Jan 24 16:20:01 CET 2018 - sch...@suse.de
+
+- Selecting evaluated/given product for installation.
+ fate#323450
+- 4.0.24
+
+-------------------------------------------------------------------
+Fri Jan 19 14:02:32 UTC 2018 - lsle...@suse.cz
+
+- Display more details when the package solver fails
+
+-------------------------------------------------------------------
+Thu Jan 18 14:37:15 CET 2018 - sch...@suse.de
+
+- Using ProductFeatures.SetSection instead of
+ ProductFeatures.SetOverlay in order to set product features.
+ This is a follow up of bsc#1070726.
+- 4.0.23
+
+-------------------------------------------------------------------
Wed Jan 17 14:04:18 UTC 2018 - jreidin...@suse.com
- adapt to yast2 changes in overlays (related to bsc#1070726)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.0.22/package/autoyast2.spec
new/autoyast2-4.0.24/package/autoyast2.spec
--- old/autoyast2-4.0.22/package/autoyast2.spec 2018-01-17 15:44:43.000000000
+0100
+++ new/autoyast2-4.0.24/package/autoyast2.spec 2018-01-24 16:46:07.000000000
+0100
@@ -22,7 +22,7 @@
%endif
Name: autoyast2
-Version: 4.0.22
+Version: 4.0.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.0.22/src/modules/AutoinstSoftware.rb
new/autoyast2-4.0.24/src/modules/AutoinstSoftware.rb
--- old/autoyast2-4.0.22/src/modules/AutoinstSoftware.rb 2018-01-17
15:44:43.000000000 +0100
+++ new/autoyast2-4.0.24/src/modules/AutoinstSoftware.rb 2018-01-24
16:46:07.000000000 +0100
@@ -14,6 +14,11 @@
module Yast
class AutoinstSoftwareClass < Module
include Yast::Logger
+
+ # This file is created by pkg-bindings when the package solver fails,
+ # it contains some details of the failure
+ BAD_LIST_FILE = "/var/log/YaST2/badlist".freeze
+
def main
Yast.import "UI"
Yast.import "Pkg"
@@ -842,12 +847,12 @@
Packages.Init(true)
# Resetting package selection of previous runs. This is needed
- # because it could be that additional repositories
+ # because it could be that additional repositories
# are available meanwhile. (bnc#979691)
Pkg.PkgApplReset
sw_settings = Profile.current.fetch("software",{})
- Pkg.SetSolverFlags({ "ignoreAlreadyRecommended" => Mode.normal,
+ Pkg.SetSolverFlags({ "ignoreAlreadyRecommended" => Mode.normal,
"onlyRequires" =>
!sw_settings.fetch("install_recommended",true) })
failed = []
@@ -883,6 +888,14 @@
)
end
+ selected_product = AutoinstFunctions.selected_product
+ if selected_product
+ log.info "Selecting product #{selected_product.inspect} for
installation"
+ selected_product.select
+ else
+ log.info "No product has been selected for installation"
+ end
+
autoinstPacks = autoinstPackages
# FIXME: optimization for package list evaluation turned off because it
optimized it
# into an unbootable state (no kernel) bnc#427731
@@ -929,11 +942,20 @@
# Solve dependencies
#
if !Pkg.PkgSolve(false)
- Report.Error(
- _(
- "The package resolver run failed. Please check your software
section in the autoyast profile."
- )
- )
+ # TRANSLATORS: Error message
+ msg = _("The package resolver run failed. Please check your software "
\
+ "section in the autoyast profile.")
+ # TRANSLATORS: Error message, %s is replaced by "/var/log/YaST2/y2log"
+ msg += "\n" + _("Additional details can be found in the %s file.") %
+ "/var/log/YaST2/y2log"
+
+ # read the details saved by pkg-bindings
+ if File.exist?(BAD_LIST_FILE)
+ msg += "\n\n"
+ msg += File.read(BAD_LIST_FILE)
+ end
+
+ Report.LongError(msg)
end
SpaceCalculation.ShowPartitionWarning
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.0.22/src/modules/AutoinstStorage.rb
new/autoyast2-4.0.24/src/modules/AutoinstStorage.rb
--- old/autoyast2-4.0.22/src/modules/AutoinstStorage.rb 2018-01-17
15:44:43.000000000 +0100
+++ new/autoyast2-4.0.24/src/modules/AutoinstStorage.rb 2018-01-24
16:46:07.000000000 +0100
@@ -85,7 +85,7 @@
general_settings.delete("btrfs_set_default_subvolume_name")
# Override product settings from control file
- Yast::ProductFeatures.SetOverlay("partitioning" => general_settings)
+ Yast::ProductFeatures.SetSection("partitioning", general_settings)
end
# Import Fstab data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.0.22/test/AutoinstGeneral_test.rb
new/autoyast2-4.0.24/test/AutoinstGeneral_test.rb
--- old/autoyast2-4.0.22/test/AutoinstGeneral_test.rb 2018-01-17
15:44:43.000000000 +0100
+++ new/autoyast2-4.0.24/test/AutoinstGeneral_test.rb 2018-01-24
16:46:07.000000000 +0100
@@ -30,8 +30,6 @@
before do
allow(Yast).to receive(:import).and_call_original
allow(Yast).to receive(:import).with("FileSystems").and_return(nil)
- # prevent stacking overlayes used by Storage import
- Yast::ProductFeatures.ClearOverlay
end
describe "#Write" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-4.0.22/test/autoinst_storage_test.rb
new/autoyast2-4.0.24/test/autoinst_storage_test.rb
--- old/autoyast2-4.0.22/test/autoinst_storage_test.rb 2018-01-17
15:44:43.000000000 +0100
+++ new/autoyast2-4.0.24/test/autoinst_storage_test.rb 2018-01-24
16:46:07.000000000 +0100
@@ -190,8 +190,8 @@
let(:profile) { { "proposal_lvm" => true } }
it "overrides control file values" do
- expect(Yast::ProductFeatures).to receive(:SetOverlay)
- .with("partitioning" => profile)
+ expect(Yast::ProductFeatures).to receive(:SetSection)
+ .with("partitioning", profile)
subject.import_general_settings(profile)
end
@@ -209,8 +209,8 @@
let(:profile) { { "btrfs_set_default_subvolume_name" => false } }
it "disables the btrfs default subvolume" do
- expect(Yast::ProductFeatures).to receive(:SetOverlay)
- .with("partitioning" => { "btrfs_default_subvolume" => "" })
+ expect(Yast::ProductFeatures).to receive(:SetSection)
+ .with("partitioning", { "btrfs_default_subvolume" => "" })
subject.import_general_settings(profile)
end
end
@@ -219,7 +219,7 @@
let(:profile) { {} }
it "uses the default for the product" do
- expect(Yast::ProductFeatures).to
receive(:SetOverlay).with("partitioning" => {})
+ expect(Yast::ProductFeatures).to
receive(:SetSection).with("partitioning", {})
subject.import_general_settings(profile)
end
end
@@ -228,7 +228,7 @@
let(:profile) { { "btrfs_set_default_subvolume_name" => true } }
it "uses the default for the product" do
- expect(Yast::ProductFeatures).to
receive(:SetOverlay).with("partitioning" => {})
+ expect(Yast::ProductFeatures).to
receive(:SetSection).with("partitioning", {})
subject.import_general_settings(profile)
end
end
