Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2022-01-27 23:16:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Thu Jan 27 23:16:47 2022 rev:492 rq:949518 version:4.4.37
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2022-01-25 17:36:37.166107342 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new.1898/yast2-installation.changes
2022-01-27 23:17:24.906792370 +0100
@@ -1,0 +2,15 @@
+Thu Jan 27 07:50:21 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Handle service name collision during upgrade (bsc#1194453),
+ do not delete the new services which have the same name
+ as an old service
+- 4.4.37
+
+-------------------------------------------------------------------
+Wed Jan 26 14:24:43 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Adjusted Linux Security Module configuration wording
+ (related to jsc#SLE-22069).
+- 4.4.36
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-4.4.35.tar.bz2
New:
----
yast2-installation-4.4.37.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.rzngNI/_old 2022-01-27 23:17:25.558787866 +0100
+++ /var/tmp/diff_new_pack.rzngNI/_new 2022-01-27 23:17:25.562787838 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.4.35
+Version: 4.4.37
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
@@ -28,8 +28,8 @@
Source2: YaST2-Firstboot.service
BuildRequires: update-desktop-files
-# Y2Packager::Resolvable.none? (bsc#1194387)
-BuildRequires: yast2 >= 4.4.33
+# Y2Packager::NewRepositorySetup
+BuildRequires: yast2 >= 4.4.42
# CIOIgnore
BuildRequires: yast2-bootloader
# storage-ng based version
@@ -70,8 +70,8 @@
Requires: pciutils
# tar-gzip some system files and untar-ungzip them after the installation
(FATE #300421, #120103)
Requires: tar
-# Y2Packager::Resolvable.none? (bsc#1194387)
-Requires: yast2 >= 4.4.33
+# Y2Packager::NewRepositorySetup
+Requires: yast2 >= 4.4.42
# CIOIgnore
Requires: yast2-bootloader
Requires: yast2-country >= 3.3.1
++++++ yast2-installation-4.4.35.tar.bz2 -> yast2-installation-4.4.37.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/package/yast2-installation.changes
new/yast2-installation-4.4.37/package/yast2-installation.changes
--- old/yast2-installation-4.4.35/package/yast2-installation.changes
2022-01-20 15:36:55.000000000 +0100
+++ new/yast2-installation-4.4.37/package/yast2-installation.changes
2022-01-27 19:40:08.000000000 +0100
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Thu Jan 27 07:50:21 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Handle service name collision during upgrade (bsc#1194453),
+ do not delete the new services which have the same name
+ as an old service
+- 4.4.37
+
+-------------------------------------------------------------------
+Wed Jan 26 14:24:43 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Adjusted Linux Security Module configuration wording
+ (related to jsc#SLE-22069).
+- 4.4.36
+
+-------------------------------------------------------------------
Thu Jan 20 08:52:18 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
- Enable RSpec verifying doubles in unit tests to ensue that
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/package/yast2-installation.spec
new/yast2-installation-4.4.37/package/yast2-installation.spec
--- old/yast2-installation-4.4.35/package/yast2-installation.spec
2022-01-20 15:36:55.000000000 +0100
+++ new/yast2-installation-4.4.37/package/yast2-installation.spec
2022-01-27 19:40:08.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 4.4.35
+Version: 4.4.37
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
@@ -28,8 +28,8 @@
Source2: YaST2-Firstboot.service
BuildRequires: update-desktop-files
-# Y2Packager::Resolvable.none? (bsc#1194387)
-BuildRequires: yast2 >= 4.4.33
+# Y2Packager::NewRepositorySetup
+BuildRequires: yast2 >= 4.4.42
# CIOIgnore
BuildRequires: yast2-bootloader
# storage-ng based version
@@ -70,8 +70,8 @@
Requires: pciutils
# tar-gzip some system files and untar-ungzip them after the installation
(FATE #300421, #120103)
Requires: tar
-# Y2Packager::Resolvable.none? (bsc#1194387)
-Requires: yast2 >= 4.4.33
+# Y2Packager::NewRepositorySetup
+Requires: yast2 >= 4.4.42
# CIOIgnore
Requires: yast2-bootloader
Requires: yast2-country >= 3.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/src/lib/installation/clients/security_proposal.rb
new/yast2-installation-4.4.37/src/lib/installation/clients/security_proposal.rb
---
old/yast2-installation-4.4.35/src/lib/installation/clients/security_proposal.rb
2022-01-20 15:36:55.000000000 +0100
+++
new/yast2-installation-4.4.37/src/lib/installation/clients/security_proposal.rb
2022-01-27 19:40:08.000000000 +0100
@@ -257,16 +257,16 @@
# after the installation will be SELinux running in the selected
mode which could be
# 'enforcing', 'permissive' or 'disabled'
format(_(
- "Linux Security Module: Activate %{module} in '%{mode}'
mode"
+ "Major Linux Security Module: Activate %{module} in
'%{mode}' mode"
), module: selected.label, mode:
selected.mode.to_human_string)
when :apparmor
# TRANSLATORS: Proposal's text describing that the active Linux
Security Major Module
# after the installation will be AppArmor
- format(_("Linux Security Module: Activate %{module}"), module:
selected.label)
+ format(_("Major Linux Security Module: Activate %{module}"), module:
selected.label)
when :none
# TRANSLATORS: Proposal's text describing that no Linux Security
Major Module will be
# activated after the installation
- _("Linux Security Module: No major module will be activated")
+ _("Major Linux Security Module: No major module will be activated")
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/src/lib/installation/dialogs/security.rb
new/yast2-installation-4.4.37/src/lib/installation/dialogs/security.rb
--- old/yast2-installation-4.4.35/src/lib/installation/dialogs/security.rb
2022-01-20 15:36:55.000000000 +0100
+++ new/yast2-installation-4.4.37/src/lib/installation/dialogs/security.rb
2022-01-27 19:40:08.000000000 +0100
@@ -127,7 +127,7 @@
def lsm_frame
frame(
- _("Linux Security Module"),
+ _("Major Linux Security Module"),
Widgets::LSM.new(@settings)
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/src/lib/installation/upgrade_repo_manager.rb
new/yast2-installation-4.4.37/src/lib/installation/upgrade_repo_manager.rb
--- old/yast2-installation-4.4.35/src/lib/installation/upgrade_repo_manager.rb
2022-01-20 15:36:55.000000000 +0100
+++ new/yast2-installation-4.4.37/src/lib/installation/upgrade_repo_manager.rb
2022-01-27 19:40:08.000000000 +0100
@@ -13,6 +13,7 @@
require "yast"
+require "y2packager/new_repository_setup"
require "y2packager/original_repository_setup"
require "y2packager/repository"
require "y2packager/service"
@@ -53,6 +54,8 @@
current_repos = Y2Packager::Repository.all
stored_repos = Y2Packager::OriginalRepositorySetup.instance.repositories
stored_repo_aliases = stored_repos.map(&:repo_alias)
+ # exclude the newly added repositories with the same alias
+ stored_repo_aliases -=
Y2Packager::NewRepositorySetup.instance.repositories
reg_urls = registration_urls
old_repos = current_repos.select do |r|
@@ -63,6 +66,8 @@
current_services = Y2Packager::Service.all
stored_services = Y2Packager::OriginalRepositorySetup.instance.services
stored_service_aliases = stored_services.map(&:alias)
+ # exclude the newly added services with the same name
+ stored_service_aliases -=
Y2Packager::NewRepositorySetup.instance.services
old_services = current_services.select { |s|
stored_service_aliases.include?(s.alias) }
# sort the repositories by name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/src/lib/installation/widgets/lsm.rb
new/yast2-installation-4.4.37/src/lib/installation/widgets/lsm.rb
--- old/yast2-installation-4.4.35/src/lib/installation/widgets/lsm.rb
2022-01-20 15:36:55.000000000 +0100
+++ new/yast2-installation-4.4.37/src/lib/installation/widgets/lsm.rb
2022-01-27 19:40:08.000000000 +0100
@@ -109,6 +109,7 @@
def init
self.value = settings.selected&.id.to_s
+ disable if items.size <= 1
end
def opt
@@ -131,7 +132,7 @@
def help
Yast::HTML.Para(
# TRANSLATORS: Linux Security Module Selector help.
- _("Allows to choose between available Linux Security major modules
like:") +
+ _("Allows to choose between available major Linux Security Modules
like:") +
Yast::HTML.List(available_modules.map(&:label))
)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/src/lib/installation/widgets/selinux_mode.rb
new/yast2-installation-4.4.37/src/lib/installation/widgets/selinux_mode.rb
--- old/yast2-installation-4.4.35/src/lib/installation/widgets/selinux_mode.rb
2022-01-20 15:36:55.000000000 +0100
+++ new/yast2-installation-4.4.37/src/lib/installation/widgets/selinux_mode.rb
2022-01-27 19:40:08.000000000 +0100
@@ -32,8 +32,7 @@
end
def label
- # TRANSLATORS: SELinux Mode just SELinux is already content of frame.
- _("Mode")
+ _("SELinux Mode")
end
def items
@@ -55,9 +54,9 @@
"<li><b>Enforcing</b> the state that enforces SELinux security
policy. "\
"Access is denied to users and programs unless permitted by " \
"SELinux security policy rules. All denial messages are logged.</li>
"\
- "<b>Permissive</b> is a diagnostic state. The security policy rules
are " \
+ "<li><b>Permissive</b> is a diagnostic state. The security policy
rules are " \
"not enforced, but SELinux sends denial messages to a log
file.</li>" \
- "<b>Disabled</b> SELinux does not enforce a security
policy.</li></ul></p>"
+ "<li><b>Disabled</b> SELinux does not enforce a security
policy.</li></ul></p>"
)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-4.4.35/test/lib/upgrade_repo_manager_test.rb
new/yast2-installation-4.4.37/test/lib/upgrade_repo_manager_test.rb
--- old/yast2-installation-4.4.35/test/lib/upgrade_repo_manager_test.rb
2022-01-20 15:36:55.000000000 +0100
+++ new/yast2-installation-4.4.37/test/lib/upgrade_repo_manager_test.rb
2022-01-27 19:40:08.000000000 +0100
@@ -134,9 +134,14 @@
describe ".create_from_old_repositories" do
before do
allow(Y2Packager::Repository).to receive(:all).and_return([repo1, repo2])
- expect(Y2Packager::OriginalRepositorySetup.instance).to
receive(:repositories)
+ allow(Y2Packager::Service).to receive(:all).and_return([])
+ allow(Y2Packager::OriginalRepositorySetup.instance).to
receive(:repositories)
.and_return([repo1, repo2])
+ allow(Y2Packager::OriginalRepositorySetup.instance).to receive(:services)
+ .and_return([])
allow(Registration::Registration).to
receive(:is_registered?).and_return(false)
+ allow(Y2Packager::NewRepositorySetup.instance).to
receive(:services).and_return([])
+ allow(Y2Packager::NewRepositorySetup.instance).to
receive(:repositories).and_return([])
end
it "initializes the UpgradeRepoManager from the stored old repositories" do
@@ -150,5 +155,18 @@
old_repo_manager =
Installation::UpgradeRepoManager.create_from_old_repositories
expect(old_repo_manager.repositories).to eq([repo1])
end
+
+ it "does not remove the new services with same name as an old service" do
+ expect(Y2Packager::NewRepositorySetup.instance).to receive(:services)
+ .and_return([service1.name])
+ expect(Y2Packager::OriginalRepositorySetup.instance).to
receive(:services)
+ .and_return([service1])
+
+ upgrade_repo_manager =
Installation::UpgradeRepoManager.create_from_old_repositories
+
+ # empty result as the old service has the same name as the new service
+ # so it is not deleted
+ expect(upgrade_repo_manager.services).to eq([])
+ end
end
end
