openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2018
- 1 participants
- 1606 discussions
Hello community,
here is the log from the commit of package yast2-theme for openSUSE:Factory checked in at 2018-11-01 19:00:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-theme (Old)
and /work/SRC/openSUSE:Factory/.yast2-theme.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-theme"
Thu Nov 1 19:00:09 2018 rev:159 rq:642422 version:4.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-theme/yast2-theme.changes 2018-08-10 09:47:49.218080829 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme.changes 2018-11-01 19:00:13.217994959 +0100
@@ -1,0 +2,33 @@
+Tue Oct 16 16:06:51 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Sun Sep 30 00:40:53 CEST 2018 - hellcp(a)opensuse.org
+
+- Changed icons to Gnome spec (boo#1110241)
+- Added hicolor/scalable/devices (boo#1109382)
+- New files in devices directory have been named according
+ to the suggested schema (boo#1110236)
+- Optipng'd all the pngs and scroted all new icons for
+ space saving
+- 4.1.4
+
+-------------------------------------------------------------------
+Tue Sep 18 09:59:20 CEST 2018 - hellcp(a)opensuse.org
+
+- Add KDE PIM icon (boo#1107103)
+- 4.1.3
+
+-------------------------------------------------------------------
+Fri Sep 14 11:01:56 CEST 2018 - schubi(a)suse.de
+
+- Unify icon location for SLES and OpenSUSE (bsc#1104067).
+- 4.1.2
+
+-------------------------------------------------------------------
+Mon Aug 20 11:11:52 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Old:
----
yast2-theme-4.1.1.tar.bz2
New:
----
yast2-theme-4.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-theme.spec ++++++
--- /var/tmp/diff_new_pack.Hzvdg5/_old 2018-11-01 19:00:13.753995005 +0100
+++ /var/tmp/diff_new_pack.Hzvdg5/_new 2018-11-01 19:00:13.757995006 +0100
@@ -19,7 +19,7 @@
# YaST Oxygen icons maintained by Martin Schlander <martin.schlander () gmail ! com>
Name: yast2-theme
-Version: 4.1.1
+Version: 4.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,7 +35,7 @@
%endif
BuildArch: noarch
Summary: YaST2 - Theme
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
Url: http://github.com/yast/yast-theme
@@ -66,8 +66,8 @@
Group: System/YaST
Supplements: packageand(yast2:plasma5-session)
PreReq: /bin/ln
+PreReq: yast2-branding-openSUSE = %{version}
Conflicts: yast2-theme-SLE
-Requires: yast2-branding-openSUSE = %{version}
Provides: yast2-theme-openSUSE-Oxygen = %{version}
Obsoletes: yast2-theme-openSUSE-Oxygen < %{version}
@@ -82,11 +82,13 @@
%package SLE
Summary: YaST2 - SLE Theme
Group: System/YaST
-Provides: yast2-theme-NLD = 0.4.6
Provides: yast2_theme = %{version}
-Obsoletes: yast2-theme-NLD <= 0.4.5
Conflicts: yast2-theme-openSUSE
Conflicts: yast2-theme-openSUSE-Oxygen
+Conflicts: yast2-branding-openSUSE
+Conflicts: yast2-branding-openSUSE-Oxygen
+Obsoletes: yast2-branding-openSUSE
+Obsoletes: yast2-branding-openSUSE-Oxygen
PreReq: /bin/ln
%description SLE
@@ -130,10 +132,11 @@
mv $RPM_BUILD_ROOT%{yast_themedir}/SLE $RPM_BUILD_ROOT%{yast_themedir}/current
-mv $RPM_BUILD_ROOT/usr/share/icons/hicolor $RPM_BUILD_ROOT/usr/share/YaST2/theme/current/icons/
+# let's take hicolor icons for yast
+ln -s /usr/share/icons/hicolor $RPM_BUILD_ROOT%{yast_themedir}/current/icons
-# remove all icons that were not part of RC2 to avoid information leak
-pushd $RPM_BUILD_ROOT/usr/share/YaST2/theme/current/icons/
+# remove unneeded icons
+pushd $RPM_BUILD_ROOT/usr/share/icons/hicolor
rm -rf 256x256
rm 16x16/apps/pattern-enlightenment.png
rm 16x16/apps/pattern-lxde.png
@@ -277,23 +280,6 @@
popd
-#
-# make icons available to GNOME control center (hicolor theme)
-# (bug #166008)
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
-mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps
-
-for dir in 22x22 32x32 48x48 64x64; do
- cd $RPM_BUILD_ROOT/%{yast_themedir}/current/icons/$dir/apps
- icons=$(ls *.png)
- cd $RPM_BUILD_ROOT/usr/share/icons/hicolor/$dir/apps
- for icon in $icons; do
- [ -e $icon ] || ln -s %{yast_themedir}/current/icons/$dir/apps/$icon .
- done
-done
-
# remove KDE icons - they are incomplete and only interesting for openSUSE
rm -rf $RPM_BUILD_ROOT/usr/share/icons/{crystal,oxygen}
%endif
@@ -302,11 +288,6 @@
%fdupes $RPM_BUILD_ROOT/usr/share/icons
%if 0%{?is_opensuse}
-%pre -n yast2-branding-openSUSE
-# used to be a symlink, we need to remove it so rpm can update to the directory
-if test -L %{yast_themedir}/current ; then
- rm %{yast_themedir}/current
-fi
%post -n yast2-branding-openSUSE-Oxygen
if test -L %{yast_themedir}/current/icons ; then
@@ -315,6 +296,7 @@
ln -s /usr/share/icons/oxygen %{yast_themedir}/current/icons
%postun -n yast2-branding-openSUSE-Oxygen
+# yast2-branding-openSUSE is still there, so we have to reset the link to higcolor
if test -L %{yast_themedir}/current/icons ; then
rm %{yast_themedir}/current/icons
fi
@@ -327,6 +309,7 @@
%config %{_sysconfdir}/icewm
/usr/share/icons/*
%doc %{yast_docdir}-openSUSE
+%license COPYING
%files -n yast2-branding-openSUSE-Oxygen
%dir /usr/share/doc/packages/yast2-theme/
@@ -334,12 +317,6 @@
%else
-%pre SLE
-# used to be a symlink, we need to remove it so rpm can update to the directory
-if test -L %{yast_themedir}/current ; then
- rm %{yast_themedir}/current
-fi
-
%files SLE
%defattr(-,root,root)
%dir %{yast_themedir}
++++++ yast2-theme-4.1.1.tar.bz2 -> yast2-theme-4.1.4.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/yast2-theme/yast2-theme-4.1.1.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-theme.new/yast2-theme-4.1.4.tar.bz2 differ: char 11, line 1
1
0
Hello community,
here is the log from the commit of package yast2-samba-server for openSUSE:Factory checked in at 2018-11-01 18:59:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-server"
Thu Nov 1 18:59:35 2018 rev:81 rq:642420 version:4.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes 2018-09-04 22:49:58.379727247 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes 2018-11-01 18:59:38.981991986 +0100
@@ -1,0 +2,12 @@
+Tue Oct 16 16:51:50 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 5 10:24:26 UTC 2018 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Fix configuration not saved after new service status management
+ (bsc#1106876)
+- 4.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-server-4.1.0.tar.bz2
New:
----
yast2-samba-server-4.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.Qiguhh/_old 2018-11-01 18:59:39.473992029 +0100
+++ /var/tmp/diff_new_pack.Qiguhh/_new 2018-11-01 18:59:39.477992029 +0100
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 4.1.0
+Version: 4.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -84,5 +84,6 @@
%{yast_desktopdir}/samba-server.desktop
%{yast_schemadir}/autoyast/rnc/samba-server.rnc
%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-samba-server-4.1.0.tar.bz2 -> yast2-samba-server-4.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/package/yast2-samba-server.changes new/yast2-samba-server-4.1.1/package/yast2-samba-server.changes
--- old/yast2-samba-server-4.1.0/package/yast2-samba-server.changes 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/package/yast2-samba-server.changes 2018-10-16 17:44:13.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Oct 16 16:51:50 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 5 10:24:26 UTC 2018 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Fix configuration not saved after new service status management
+ (bsc#1106876)
+- 4.1.1
+
+-------------------------------------------------------------------
Mon Aug 20 16:09:08 CEST 2018 - schubi(a)suse.de
- Switched license in spec file from SPDX2 to SPDX3 format.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/package/yast2-samba-server.spec new/yast2-samba-server-4.1.1/package/yast2-samba-server.spec
--- old/yast2-samba-server-4.1.0/package/yast2-samba-server.spec 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/package/yast2-samba-server.spec 2018-10-16 17:44:13.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-samba-server
-Version: 4.1.0
+Version: 4.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -85,3 +85,4 @@
%{yast_desktopdir}/samba-server.desktop
%{yast_schemadir}/autoyast/rnc/samba-server.rnc
%doc %{yast_docdir}
+%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/src/include/samba-server/complex.rb new/yast2-samba-server-4.1.1/src/include/samba-server/complex.rb
--- old/yast2-samba-server-4.1.0/src/include/samba-server/complex.rb 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/src/include/samba-server/complex.rb 2018-10-16 17:44:13.000000000 +0200
@@ -114,23 +114,15 @@
# Saves service status (start mode and starts/stops the service)
#
- # @note For AutoYaST and for command line actions, it uses the old way for
- # backward compatibility, see {SambaServer#Write}. When the service is
- # configured using the UI, it is directly saved. See
- # {Yast2::SystemService#save}.
- #
# @param switch_to_reload [Boolean] indicates if restart action must be
# replaced with reload. See the Bugzilla #120080 stated in #WriteDialog
# comments
#
# @return [Boolean] true if service is saved successfully; false otherwise
def save_status(switch_to_reload)
- if Mode.auto || Mode.commandline
- SambaServer.Write(false)
- else
- services.reload if services.action == :restart && switch_to_reload
- services.save
- end
+ return false unless SambaServer.Write(false)
+ services.reload if services.action == :restart && switch_to_reload
+ services.save
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/src/modules/SambaServer.pm new/yast2-samba-server-4.1.1/src/modules/SambaServer.pm
--- old/yast2-samba-server-4.1.0/src/modules/SambaServer.pm 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/src/modules/SambaServer.pm 2018-10-16 17:44:13.000000000 +0200
@@ -263,13 +263,10 @@
my $caption = __("Saving Samba Server Configuration");
# We do not set help text here, because it was set outside
- Progress->New($caption, " ", 5, [
+ Progress->New($caption, " ", 4, [
# translators: write progress stage
_("Write global settings"),
# translators: write progress stage
- ( !SambaService->GetServiceAutoStart() ? _("Disable Samba services")
- # translators: write progress stage
- : _("Enable Samba services") ),
# translators: write progress stage
_("Write back-end settings"),
# translators: write progress stage
@@ -280,10 +277,6 @@
# translators: write progress step
_("Writing global settings..."),
# translators: write progress step
- ! SambaService->GetServiceAutoStart() ? _("Disabling Samba services...")
- # translators: write progress step
- : _("Enabling Samba services..."),
- # translators: write progress step
_("Writing back-end settings..."),
# translators: write progress step
_("Writing Samba accounts..."),
@@ -320,24 +313,17 @@
SCR->Execute(".target.bash", "touch " . DONE_ONCE_FILE);
# write samba shares feature, only write => 1
Samba->WriteShares();
-
- # 2: write services settings
- Progress->NextStage();
- SambaService->Write();
- # 3: write backends settings && write trusted domains
+ # 2: write backends settings && write trusted domains
Progress->NextStage();
SambaBackend->Write();
SambaTrustDom->Write();
-
- # 4: write accounts
+
+ # 3: write accounts
Progress->NextStage();
SambaAccounts->Write();
- # 4.5: start, stop, reload service
- SambaService->StartStopReload();
-
- # 5: save firewall settings
+ # 4: save firewall settings
Progress->NextStage();
my $po = Progress->set(0);
FirewalldWrapper->write();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.1.0/test/dialog_complex_test.rb new/yast2-samba-server-4.1.1/test/dialog_complex_test.rb
--- old/yast2-samba-server-4.1.0/test/dialog_complex_test.rb 2018-08-21 17:51:44.000000000 +0200
+++ new/yast2-samba-server-4.1.1/test/dialog_complex_test.rb 2018-10-16 17:44:13.000000000 +0200
@@ -123,64 +123,86 @@
end
context "when running in UI mode" do
- it "saves the system service" do
- expect(services).to receive(:save)
+ context "and fails written configuration" do
+ before do
+ allow(Yast::SambaServer).to receive(:Write).and_return(false)
- samba.WriteDialog
- end
+ it "does not save the system service" do
+ expect(services).to_not receive(:save)
+
+ samba.WriteDialog
+ end
- it "returns :next when sevice is saved successfully" do
- expect(samba.WriteDialog).to eq(:next)
+ it "returns :abort" do
+ expect(samba.WriteDialog).to eq(:abort)
+ end
+ end
end
- it "returns :abort when fails saving the service" do
- allow(services).to receive(:save).and_return(false)
+ context "and configuration is written" do
+ before do
+ allow(Yast::SambaServer).to receive(:Write).and_return(true)
+ end
- expect(samba.WriteDialog).to eq(:abort)
- end
+ it "saves the system service" do
+ expect(services).to receive(:save)
- context "and action is :restart" do
- let(:action) { :restart }
+ samba.WriteDialog
+ end
- context "but the service is already running" do
- let(:service_running) { true }
- let(:service_on_boot) { true }
-
- context "with connected users" do
- it "changes action to :reload" do
- expect(services).to receive(:reload)
+ it "returns :next when sevice is saved successfully" do
+ expect(samba.WriteDialog).to eq(:next)
+ end
- samba.WriteDialog
- end
+ it "returns :abort when fails saving the service" do
+ allow(services).to receive(:save).and_return(false)
- it "reports a message" do
- allow(services).to receive(:reload)
- expect(Yast::Report).to receive(:Message)
+ expect(samba.WriteDialog).to eq(:abort)
+ end
- samba.WriteDialog
+ context "and action is :restart" do
+ let(:action) { :restart }
+
+ context "but the service is already running" do
+ let(:service_running) { true }
+ let(:service_on_boot) { true }
+
+ context "with connected users" do
+ it "changes action to :reload" do
+ expect(services).to receive(:reload)
+
+ samba.WriteDialog
+ end
+
+ it "reports a message" do
+ allow(services).to receive(:reload)
+ expect(Yast::Report).to receive(:Message)
+
+ samba.WriteDialog
+ end
end
- end
- context "without connected users" do
- let(:connected_users) { [] }
+ context "without connected users" do
+ let(:connected_users) { [] }
- it "performs the requested action" do
- expect(services).to_not receive(:reload)
+ it "performs the requested action" do
+ expect(services).to_not receive(:reload)
- samba.WriteDialog
+ samba.WriteDialog
+ end
end
end
end
- end
- context "and action is NOT :restart" do
- let (:action) { :reload }
+ context "and action is NOT :restart" do
+ let (:action) { :reload }
- context "and there are connected users" do
- it "does not report message" do
- expect(Yast::Report).to_not receive(:Message)
+ context "and there are connected users" do
+ it "does not report message" do
+ expect(Yast::Report).to_not receive(:Message)
- samba.WriteDialog
+ samba.WriteDialog
+ end
end
end
end
1
0
Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2018-11-01 18:59:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-update (Old)
and /work/SRC/openSUSE:Factory/.yast2-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update"
Thu Nov 1 18:59:00 2018 rev:124 rq:642416 version:4.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2018-09-04 22:50:18.855797576 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2018-11-01 18:59:02.485988731 +0100
@@ -1,0 +2,23 @@
+Tue Oct 16 16:37:07 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 19 16:52:02 CEST 2018 - schubi(a)suse.de
+
+- Fixed crash while writing backup (bsc#1108934)
+- 4.1.4
+
+-------------------------------------------------------------------
+Mon Sep 17 12:20:58 UTC 2018 - dgonzalez(a)suse.com
+
+- Avoid to restore old backups when upgrade fails (bsc#1097297)
+- 4.1.3
+
+-------------------------------------------------------------------
+Tue Sep 11 15:34:53 CEST 2018 - aschnell(a)suse.com
+
+- do not translate snapshot description (bsc#1092757)
+- 4.1.2
+
+-------------------------------------------------------------------
Old:
----
yast2-update-4.1.1.tar.bz2
New:
----
yast2-update-4.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.TJe1US/_old 2018-11-01 18:59:02.953988773 +0100
+++ /var/tmp/diff_new_pack.TJe1US/_new 2018-11-01 18:59:02.953988773 +0100
@@ -17,7 +17,7 @@
Name: yast2-update
-Version: 4.1.1
+Version: 4.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -131,5 +131,6 @@
%{yast_controldir}/update.xml
%{yast_clientdir}/update.rb
%{yast_clientdir}/run_update.rb
+%license COPYING
%changelog
++++++ yast2-update-4.1.1.tar.bz2 -> yast2-update-4.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.1/package/yast2-update.changes new/yast2-update-4.1.4/package/yast2-update.changes
--- old/yast2-update-4.1.1/package/yast2-update.changes 2018-08-23 10:03:34.000000000 +0200
+++ new/yast2-update-4.1.4/package/yast2-update.changes 2018-10-16 17:43:56.000000000 +0200
@@ -1,4 +1,27 @@
-------------------------------------------------------------------
+Tue Oct 16 16:37:07 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 19 16:52:02 CEST 2018 - schubi(a)suse.de
+
+- Fixed crash while writing backup (bsc#1108934)
+- 4.1.4
+
+-------------------------------------------------------------------
+Mon Sep 17 12:20:58 UTC 2018 - dgonzalez(a)suse.com
+
+- Avoid to restore old backups when upgrade fails (bsc#1097297)
+- 4.1.3
+
+-------------------------------------------------------------------
+Tue Sep 11 15:34:53 CEST 2018 - aschnell(a)suse.com
+
+- do not translate snapshot description (bsc#1092757)
+- 4.1.2
+
+-------------------------------------------------------------------
Wed Aug 22 09:55:27 CEST 2018 - schubi(a)suse.de
- Switched license in spec file from SPDX2 to SPDX3 format.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.1/package/yast2-update.spec new/yast2-update-4.1.4/package/yast2-update.spec
--- old/yast2-update-4.1.1/package/yast2-update.spec 2018-08-23 10:03:34.000000000 +0200
+++ new/yast2-update-4.1.4/package/yast2-update.spec 2018-10-16 17:43:56.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-update
-Version: 4.1.1
+Version: 4.1.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -131,3 +131,4 @@
%{yast_controldir}/update.xml
%{yast_clientdir}/update.rb
%{yast_clientdir}/run_update.rb
+%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.1/src/modules/RootPart.rb new/yast2-update-4.1.4/src/modules/RootPart.rb
--- old/yast2-update-4.1.1/src/modules/RootPart.rb 2018-08-23 10:03:34.000000000 +0200
+++ new/yast2-update-4.1.4/src/modules/RootPart.rb 2018-10-16 17:43:56.000000000 +0200
@@ -1677,8 +1677,8 @@
# enter the mount points of the newly mounted partitions
update_staging!
if Yast2::FsSnapshot.configured?
- # TRANSLATORS: label for filesystem snapshot taken before system update
- snapshot = Yast2::FsSnapshot.create_pre(_("before update"), cleanup: :number, important: true)
+ # as of bsc #1092757 snapshot descriptions are not translated
+ snapshot = Yast2::FsSnapshot.create_pre("before update", cleanup: :number, important: true)
Yast2::FsSnapshotStore.save("update", snapshot.number)
end
Update.clean_backup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.1/src/modules/Update.rb new/yast2-update-4.1.4/src/modules/Update.rb
--- old/yast2-update-4.1.1/src/modules/Update.rb 2018-08-23 10:03:34.000000000 +0200
+++ new/yast2-update-4.1.4/src/modules/Update.rb 2018-10-16 17:43:56.000000000 +0200
@@ -285,7 +285,7 @@
found = Builtins.find(to_install) { |u| u == i }
found != nil
end
- @_products_compatible = equal_product != nil
+ @_products_compatible = equal_product != nil
# no product name found
# bugzilla #218720, valid without testing according to comment #10
else
@@ -430,7 +430,7 @@
# Remove 'Beta...' from product release
if Builtins.regexpmatch(old_name, "Beta")
- old_name = Builtins.regexpsub(old_name, "^(.*)[ \t]+Beta.*$", "\\1")
+ old_name = Builtins.regexpsub(old_name, "^(.*)[ \t]+Beta.*$", "\\1")
# Remove 'Alpha...' from product release
elsif Builtins.regexpmatch(old_name, "Alpha")
old_name = Builtins.regexpsub(old_name, "^(.*)[ \t]+Alpha.*$", "\\1")
@@ -467,7 +467,7 @@
Installation.installedVersion,
"major",
Builtins.tointeger(inst_ver)
- )
+ )
# openSUSE
elsif Builtins.regexpmatch(inst_ver, "^[0123456789]+.[0123456789]+$")
Ops.set(
@@ -550,7 +550,7 @@
Ops.subtract(num, 1),
0
)
- end
+ end
# default for !Stage::normal
else
update_to_source = Packages.GetBaseSourceID
@@ -624,7 +624,7 @@
Installation.updateVersion,
"major",
Builtins.tointeger(new_ver)
- )
+ )
# openSUSE
elsif Builtins.regexpmatch(new_ver, "^[0123456789]+.[0123456789]$")
Ops.set(
@@ -773,47 +773,104 @@
end
BACKUP_DIR = "var/adm/backup/system-upgrade"
- # Creates backup with name based on `name` contaings everything
- # matching globs in `paths`.
- # @param name[String] name for backup file. Use a number prefix to run
- # the restore scripts in the expected order. Use a bash friendly name ;)
+
+ # Creates the backup with name based on `name` containing everything matching globs in `paths`
+ #
# @note Can be called only after target root is mounted.
#
+ # @param name [String] name for backup file. Use a number prefix to run the restore scripts in
+ # the expected order. Use a bash friendly name ;)
+ # @param paths [Array<String>] paths to files that must be included
+ #
# @example to store repos file and credentials directory
- # Update.create_backup("0100-repos", ["/etc/zypp/repos.d/*", "/etc/zypp/credentials"])
+ # Yast::Update.create_backup("0100-repos", ["/etc/zypp/repos.d/*", "/etc/zypp/credentials"])
def create_backup(name, paths)
- log.info "Creating tarball for #{name} including #{paths}"
mounted_root = Installation.destdir
+ # ensure directory exists
+ backup_dir = Pathname.new("#{mounted_root}/#{BACKUP_DIR}")
+ ::FileUtils.mkdir_p(backup_dir) unless backup_dir.exist?
+
+ # Copy the os-release file (bsc#1097297)
+ log.info "Copying the os-release file"
+ copy_os_release
+
+ log.info "Creating the tarball for #{name} including #{paths}"
tarball_path = File.join(BACKUP_DIR, "#{name}.tar.gz")
root_tarball_path = File.join(mounted_root, tarball_path)
create_tarball(root_tarball_path, mounted_root, paths)
+ log.info "Creating the restore script for #{name}"
script_path = File.join(mounted_root, BACKUP_DIR, "restore-#{name}.sh")
create_restore_script(script_path, tarball_path, paths)
end
- # clean backup content. Usefull to clean up all content before creating new backup
+ # Removes the backup content
+ #
+ # Usefull to clean up **ALL** content in BACKUP_DIR before creating a new backup.
def clean_backup
log.info "Cleaning backup dir"
- mounted_root = Installation.destdir
- ::FileUtils.rm_r(File.join(mounted_root, BACKUP_DIR),
- :force => true, :secure => true)
+ ::FileUtils.rm_r(File.join(Installation.destdir, BACKUP_DIR), :force => true, :secure => true)
end
- # restores backup
+ # Restores the available backup(s)
+ #
+ # If the ID and VERSION_ID in the backup os-release file matches with the values stored in
+ # /etc/os-release (see bsc#1097297), the available backup scripts (restores-*.sh) will be
+ # executed **in the expected order** (see bsc#1089643).
+ #
+ # @see #restore_backup?
def restore_backup
- log.info "Restoring backup"
- mounted_root = Installation.destdir
- script_glob = File.join(mounted_root, BACKUP_DIR,"restore-*.sh")
- # sort the scripts to execute them in the expected order
- ::Dir.glob(script_glob).sort.each do |path|
- cmd = "sh #{path} #{File.join("/", mounted_root)}"
- res = SCR.Execute(path(".target.bash_output"), cmd)
- log.info "Restoring with script #{cmd} result: #{res}"
+ log.info "Restoring the backup"
+
+ if restore_backup?
+ mounted_root = Installation.destdir
+ available_restore_scripts = ::Dir.glob(File.join(mounted_root, BACKUP_DIR, "restore-*.sh"))
+
+ available_restore_scripts.sort.each do |path|
+ cmd = "sh #{path} #{File.join("/", mounted_root)}"
+ res = SCR.Execute(path(".target.bash_output"), cmd)
+
+ log.info "Restoring with script #{cmd} result: #{res}"
+ end
+ else
+ log.error "Backup was not restored because its version info does not match"
end
end
+ # Check if backup must be restored, based on the version info (bsc#1097297)
+ #
+ # @see #version_from
+ #
+ # @return [Boolean] true when versions matches; false otherwise
+ def restore_backup?
+ current_release = Pathname.new("#{Installation.destdir}/etc/os-release")
+ backed_release = Pathname.new("#{Installation.destdir}/#{BACKUP_DIR}/os-release")
+ current_version = version_from(current_release)
+ backed_version = version_from(backed_release)
+
+ log.info "Version expected: #{current_version}. Backup version: #{backed_version}"
+
+ version_from(current_release) == version_from(backed_release)
+ end
+
+ # Returns the ID and VERSION_ID from given file
+ #
+ # @see https://www.freedesktop.org/software/systemd/man/os-release.html
+ #
+ # @param file [File|Pathname] Operating system identification file
+ #
+ # @return [String] a string holding the ID and VERSION_ID or empty if something went wrong
+ def version_from(file)
+ content = file.read
+ id = content[/^ID=.*/].split("=", 2).last.tr('"', '')
+ version_id = content[/^VERSION_ID=.*/].split("=", 2).last.tr('"', '')
+
+ "#{id}-#{version_id}"
+ rescue SystemCallError
+ ""
+ end
+
publish :variable => :packages_to_install, :type => "integer"
publish :variable => :packages_to_update, :type => "integer"
publish :variable => :packages_to_remove, :type => "integer"
@@ -850,14 +907,23 @@
private
+ # Includes the os-release file to backup
+ #
+ # @see https://www.freedesktop.org/software/systemd/man/os-release.html
+ def copy_os_release
+ ::FileUtils.cp(
+ Pathname.new("#{Installation.destdir}/etc/os-release"),
+ Pathname.new("#{Installation.destdir}/#{BACKUP_DIR}")
+ )
+ rescue SystemCallError
+ nil
+ end
+
def create_tarball(tarball_path, root, paths)
# tar reports an error if a file does not exist.
# So we have to check this before.
existing_paths = paths.select { |p| File.exist?(File.join(root, p)) }
- # ensure directory exists
- ::FileUtils.mkdir_p(File.dirname(tarball_path))
-
paths_without_prefix = existing_paths.map {|p| p.start_with?("/") ? p[1..-1] : p }
command = "tar cv -C '#{root}'"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.1/test/data/etc/leap-15-os-release new/yast2-update-4.1.4/test/data/etc/leap-15-os-release
--- old/yast2-update-4.1.1/test/data/etc/leap-15-os-release 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-4.1.4/test/data/etc/leap-15-os-release 2018-10-16 17:43:56.000000000 +0200
@@ -0,0 +1,11 @@
+NAME="openSUSE Leap"
+VERSION="15.0"
+ID="opensuse-leap"
+ID_LIKE="suse opensuse"
+VERSION_ID="15.0"
+PRETTY_NAME="openSUSE Leap 15.0"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:leap:15.0"
+BUG_REPORT_URL="https://bugs.opensuse.org"
+HOME_URL="https://www.opensuse.org/"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.1/test/data/etc/tw-os-release new/yast2-update-4.1.4/test/data/etc/tw-os-release
--- old/yast2-update-4.1.1/test/data/etc/tw-os-release 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-4.1.4/test/data/etc/tw-os-release 2018-10-16 17:43:56.000000000 +0200
@@ -0,0 +1,11 @@
+NAME="openSUSE Tumbleweed"
+VERSION="20180911"
+ID="opensuse-tumbleweed"
+ID_LIKE="opensuse suse"
+VERSION_ID="20180911"
+PRETTY_NAME="openSUSE Tumbleweed"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:opensuse:tumbleweed:20180911"
+BUG_REPORT_URL="https://bugs.opensuse.org"
+HOME_URL="https://www.opensuse.org/"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-4.1.1/test/update_test.rb new/yast2-update-4.1.4/test/update_test.rb
--- old/yast2-update-4.1.1/test/update_test.rb 2018-08-23 10:03:34.000000000 +0200
+++ new/yast2-update-4.1.4/test/update_test.rb 2018-10-16 17:43:56.000000000 +0200
@@ -62,14 +62,62 @@
describe "#create_backup" do
before(:each) do
+ allow(::FileUtils).to receive(:cp)
allow(::FileUtils).to receive(:mkdir_p)
allow(::File).to receive(:write)
allow(::FileUtils).to receive(:chmod)
allow(::File).to receive(:exist?).and_return(true)
+ allow(Pathname).to receive(:new).and_return(double("Pathname", exist?: true))
allow(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), /^tar /).
and_return({"exit" => 0})
end
+ let(:backup_dir) { "#{Yast::Installation.destdir}/#{Yast::UpdateClass::BACKUP_DIR}" }
+ let(:backup_dir_pathname) { double("Pathname") }
+ let(:os_release_pathname) { double }
+
+ context "when backup directory does not exit yet" do
+ before do
+ allow(Pathname).to receive(:new).with(backup_dir).and_return(backup_dir_pathname)
+ allow(backup_dir_pathname).to receive(:exist?).and_return(false)
+ end
+
+ it "creates it" do
+ expect(::FileUtils).to receive(:mkdir_p).with(backup_dir_pathname)
+
+ Yast::Update.create_backup("test", [])
+ end
+ end
+
+ context "when backup directory is alreday present" do
+ before do
+ allow(Pathname).to receive(:new).with(backup_dir).and_return(backup_dir_pathname)
+ allow(backup_dir_pathname).to receive(:exist?).and_return(true)
+ end
+
+ it "does not create it again" do
+ expect(::FileUtils).to_not receive(:mkdir_p).with(backup_dir_pathname)
+
+ Yast::Update.create_backup("test", [])
+ end
+ end
+
+ it "copies the release info file" do
+ allow(Pathname).to receive(:new)
+ .with("#{Yast::Installation.destdir}/etc/os-release")
+ .and_return(os_release_pathname)
+
+ expect(::FileUtils).to receive(:cp).with(os_release_pathname, anything)
+
+ Yast::Update.create_backup('testing', [])
+ end
+
+ it "does not crash when os-release file does not exists" do
+ allow(::FileUtils).to receive(:cp).and_raise(Errno::ENOENT)
+
+ expect { Yast::Update.create_backup('testing', []) }.to_not raise_error
+ end
+
it "create tarball including given name with all paths added" do
name = "test-backup"
paths = ["a", "b"]
@@ -137,17 +185,77 @@
end
describe "#restore_backup" do
- it "call all restore scripts in backup directory" do
- expect(::Dir).to receive(:glob).and_return(["restore-a.sh", "restore-b.sh"])
- expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), /sh .*restore-a.sh \/mnt/).
- and_return({"exit" => 0})
- expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), /sh .*restore-b.sh \/mnt/).
- and_return({"exit" => 0})
+ let(:os_release_pathname) { double }
+ let(:os_backup_release_pathname) { double }
+ let(:os_release_content) { File.new("#{DATA_DIR}/etc/leap-15-os-release").read }
+ let(:os_backup_release_content) { File.new("#{DATA_DIR}/etc/tw-os-release").read }
+ let(:backup_dir) { "#{Yast::Installation.destdir}/#{Yast::UpdateClass::BACKUP_DIR}" }
+
+ before do
+ allow(Yast::Update.log).to receive(:info).and_call_original
+
+ allow(::Dir).to receive(:glob).and_return(["restore-a.sh", "restore-b.sh"])
+
+ allow(Pathname).to receive(:new)
+ .with("#{Yast::Installation.destdir}/etc/os-release")
+ .and_return(os_release_pathname)
+ allow(Pathname).to receive(:new)
+ .with("#{backup_dir}/os-release")
+ .and_return(os_backup_release_pathname)
+ allow(os_release_pathname).to receive(:read).and_return(os_release_content)
+ allow(os_backup_release_pathname).to receive(:read).and_return(os_backup_release_content)
+ end
+
+ it "check the release info files" do
+ expect(Pathname).to receive(:new)
+ .with("#{Yast::Installation.destdir}/etc/os-release")
+ expect(Pathname).to receive(:new)
+ .with("#{backup_dir}/os-release")
Yast::Update.restore_backup
end
- end
+ context "when any file does not exists" do
+ it "does not crash" do
+ allow(os_backup_release_pathname).to receive(:read).and_raise(Errno::ENOENT)
+
+ expect { Yast::Update.restore_backup }.to_not raise_error
+ end
+ end
+
+ context "when the release info match" do
+ let(:os_backup_release_content) { os_release_content }
+
+ it "call all restore scripts in backup directory" do
+ expect(Yast::SCR).to receive(:Execute)
+ .with(Yast::Path.new(".target.bash_output"), /sh .*restore-a.sh \/mnt/)
+ expect(Yast::SCR).to receive(:Execute)
+ .with(Yast::Path.new(".target.bash_output"), /sh .*restore-b.sh \/mnt/)
+
+ Yast::Update.restore_backup
+ end
+ end
+
+ context "when the release info does not match" do
+ it "logs info and error" do
+ expect(Yast::Update.log).to receive(:info)
+ .with("Version expected: opensuse-leap-15.0. Backup version: opensuse-tumbleweed-20180911")
+ .and_call_original
+ expect(Yast::Update.log).to receive(:error).with(/not restored/).and_call_original
+
+ Yast::Update.restore_backup
+ end
+
+ it "does not continue" do
+ expect(Yast::SCR).to_not receive(:Execute)
+ .with(Yast::Path.new(".target.bash_output"), /sh .*restore-a.sh \/mnt/)
+ expect(Yast::SCR).to_not receive(:Execute)
+ .with(Yast::Path.new(".target.bash_output"), /sh .*restore-b.sh \/mnt/)
+
+ Yast::Update.restore_backup
+ end
+ end
+ end
describe "#SetDesktopPattern" do
context "if there is no definition of window manager upgrade path in control file" do
1
0
Hello community,
here is the log from the commit of package yast2-ycp-ui-bindings for openSUSE:Factory checked in at 2018-11-01 18:58:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ycp-ui-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-ycp-ui-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ycp-ui-bindings"
Thu Nov 1 18:58:26 2018 rev:72 rq:642415 version:4.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes 2017-11-19 11:07:00.844963399 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-ycp-ui-bindings.new/yast2-ycp-ui-bindings.changes 2018-11-01 18:58:29.913985751 +0100
@@ -1,0 +2,17 @@
+Tue Oct 16 16:35:35 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Tue Oct 9 09:41:09 UTC 2018 - snwint(a)suse.com
+
+- increase version to correspond to the libyui version increase
+ (related to bsc#991090)
+- 4.1.0
+
+-------------------------------------------------------------------
+Mon Aug 20 14:11:53 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Old:
----
yast2-ycp-ui-bindings-4.0.0.tar.bz2
New:
----
yast2-ycp-ui-bindings-4.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ycp-ui-bindings.spec ++++++
--- /var/tmp/diff_new_pack.vWQjhe/_old 2018-11-01 18:58:30.289985786 +0100
+++ /var/tmp/diff_new_pack.vWQjhe/_new 2018-11-01 18:58:30.293985787 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-ycp-ui-bindings
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-ycp-ui-bindings
-Version: 4.0.0
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +43,7 @@
BuildRequires: boost-devel
Summary: YaST2 - YCP Bindings for the YaST2 User Interface Engine
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
%description
@@ -96,5 +96,6 @@
%{yast_includedir}
%{_libdir}/pkgconfig/yast2-ycp-ui-bindings.pc
%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-ycp-ui-bindings-4.0.0.tar.bz2 -> yast2-ycp-ui-bindings-4.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-4.0.0/examples/PatternSelector-wizard.rb new/yast2-ycp-ui-bindings-4.1.0/examples/PatternSelector-wizard.rb
--- old/yast2-ycp-ui-bindings-4.0.0/examples/PatternSelector-wizard.rb 2017-11-15 18:30:27.473202615 +0100
+++ new/yast2-ycp-ui-bindings-4.1.0/examples/PatternSelector-wizard.rb 2018-10-16 17:43:55.000000000 +0200
@@ -7,6 +7,8 @@
Yast.import "UI"
Yast.import "Pkg"
+ textdomain "example"
+
# Pkg::SourceCreate( "http://dist.suse.de/install/SLP/SUSE-10.1-Beta3/i386/CD1/", "" );
Pkg.SourceCreate("file:/srv/sles-10-i386/CD1/", "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-4.0.0/package/yast2-ycp-ui-bindings.changes new/yast2-ycp-ui-bindings-4.1.0/package/yast2-ycp-ui-bindings.changes
--- old/yast2-ycp-ui-bindings-4.0.0/package/yast2-ycp-ui-bindings.changes 2017-11-15 18:30:27.545202615 +0100
+++ new/yast2-ycp-ui-bindings-4.1.0/package/yast2-ycp-ui-bindings.changes 2018-10-16 17:43:55.000000000 +0200
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Tue Oct 16 16:35:35 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Tue Oct 9 09:41:09 UTC 2018 - snwint(a)suse.com
+
+- increase version to correspond to the libyui version increase
+ (related to bsc#991090)
+- 4.1.0
+
+-------------------------------------------------------------------
+Mon Aug 20 14:11:53 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Wed Nov 15 17:31:59 CET 2017 - shundhammer(a)suse.de
- Fixed segfault when comparing YCPValueWidgetIDs with
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ycp-ui-bindings-4.0.0/package/yast2-ycp-ui-bindings.spec new/yast2-ycp-ui-bindings-4.1.0/package/yast2-ycp-ui-bindings.spec
--- old/yast2-ycp-ui-bindings-4.0.0/package/yast2-ycp-ui-bindings.spec 2017-11-15 18:30:27.545202615 +0100
+++ new/yast2-ycp-ui-bindings-4.1.0/package/yast2-ycp-ui-bindings.spec 2018-10-16 17:43:55.000000000 +0200
@@ -17,14 +17,14 @@
Name: yast2-ycp-ui-bindings
-Version: 4.0.0
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Group: System/YaST
-License: GPL-2.0
+License: GPL-2.0-only
BuildRequires: gcc-c++
BuildRequires: libtool
@@ -97,5 +97,6 @@
%{yast_includedir}
%{_libdir}/pkgconfig/yast2-ycp-ui-bindings.pc
%doc %{yast_docdir}
+%license COPYING
%changelog
1
0
Hello community,
here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at 2018-11-01 18:57:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-samba-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client"
Thu Nov 1 18:57:51 2018 rev:95 rq:642414 version:4.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes 2018-05-01 22:37:58.388167083 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-samba-client.new/yast2-samba-client.changes 2018-11-01 18:57:54.557982437 +0100
@@ -1,0 +2,17 @@
+Tue Oct 16 16:30:49 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 26 14:02:33 UTC 2018 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Fix reading the permitted group to create "user shares";
+ (bsc#1107574).
+- 4.0.3
+
+-------------------------------------------------------------------
+Mon Aug 20 14:06:28 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Old:
----
yast2-samba-client-4.0.2.tar.bz2
New:
----
yast2-samba-client-4.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.z5dEZr/_old 2018-11-01 18:57:54.965982476 +0100
+++ /var/tmp/diff_new_pack.z5dEZr/_new 2018-11-01 18:57:54.969982476 +0100
@@ -17,7 +17,7 @@
Name: yast2-samba-client
-Version: 4.0.2
+Version: 4.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +43,7 @@
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Samba Client Configuration
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
%description
@@ -72,5 +72,6 @@
%{yast_agentdir}/ag_pam_mount
%{yast_schemadir}/autoyast/rnc/samba-client.rnc
%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-samba-client-4.0.2.tar.bz2 -> yast2-samba-client-4.0.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-4.0.2/package/yast2-samba-client.changes new/yast2-samba-client-4.0.3/package/yast2-samba-client.changes
--- old/yast2-samba-client-4.0.2/package/yast2-samba-client.changes 2018-04-27 16:03:57.000000000 +0200
+++ new/yast2-samba-client-4.0.3/package/yast2-samba-client.changes 2018-10-16 17:43:51.000000000 +0200
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Tue Oct 16 16:30:49 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 26 14:02:33 UTC 2018 - Samuel Cabrero <scabrero(a)suse.de>
+
+- Fix reading the permitted group to create "user shares";
+ (bsc#1107574).
+- 4.0.3
+
+-------------------------------------------------------------------
+Mon Aug 20 14:06:28 CEST 2018 - schubi(a)suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Fri Apr 27 13:36:58 UTC 2018 - palcantara(a)suse.de
- yast-samba-client fails to join if /etc/samba/smb.conf or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-4.0.2/package/yast2-samba-client.spec new/yast2-samba-client-4.0.3/package/yast2-samba-client.spec
--- old/yast2-samba-client-4.0.2/package/yast2-samba-client.spec 2018-04-27 16:03:57.000000000 +0200
+++ new/yast2-samba-client-4.0.3/package/yast2-samba-client.spec 2018-10-16 17:43:51.000000000 +0200
@@ -17,14 +17,14 @@
Name: yast2-samba-client
-Version: 4.0.2
+Version: 4.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Group: System/YaST
-License: GPL-2.0
+License: GPL-2.0-only
BuildRequires: yast2-pam yast2-perl-bindings perl-XML-Writer yast2-testsuite update-desktop-files
BuildRequires: yast2-devtools >= 3.1.10
Requires: perl-XML-LibXML
@@ -69,3 +69,4 @@
%{yast_agentdir}/ag_pam_mount
%{yast_schemadir}/autoyast/rnc/samba-client.rnc
%doc %{yast_docdir}
+%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-4.0.2/src/modules/Samba.rb new/yast2-samba-client-4.0.3/src/modules/Samba.rb
--- old/yast2-samba-client-4.0.2/src/modules/Samba.rb 2018-04-27 16:03:57.000000000 +0200
+++ new/yast2-samba-client-4.0.3/src/modules/Samba.rb 2018-10-16 17:43:51.000000000 +0200
@@ -361,7 +361,7 @@
SCR.Execute(
path(".target.bash_output"),
Builtins.sformat(
- "getent group | grep \":%1:\" | /usr/bin/cut -f 1 -d :",
+ "getent group %1 | /usr/bin/cut -f 1 -d :",
Ops.get_integer(stat, "gid", 100)
)
)
1
0
Hello community,
here is the log from the commit of package yast2-registration for openSUSE:Factory checked in at 2018-11-01 18:57:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-registration (Old)
and /work/SRC/openSUSE:Factory/.yast2-registration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-registration"
Thu Nov 1 18:57:17 2018 rev:23 rq:642404 version:4.1.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-registration/yast2-registration.changes 2018-09-04 22:51:43.312087421 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-registration.new/yast2-registration.changes 2018-11-01 18:57:22.529979362 +0100
@@ -1,0 +2,29 @@
+Tue Oct 16 15:35:43 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Fri Oct 12 10:41:27 CEST 2018 - schubi(a)suse.de
+
+- Added tags full_system_media_name and full_system_download_url
+ in control.xml which describe the location for the
+ "all-packages" medium. This information will be shown if the
+ registration has been scipped by the user. No hint will be shown
+ if these tags have not been defined. (fate#325834)
+- 4.1.5
+
+-------------------------------------------------------------------
+Thu Oct 11 14:55:15 UTC 2018 - lslezak(a)suse.cz
+
+- CRLF control characters cannot be included in the registration
+ code, added validation check (bsc#1111419)
+- 4.1.4
+
+-------------------------------------------------------------------
+Mon Sep 17 08:54:19 UTC 2018 - lslezak(a)suse.cz
+
+- Suggest downloading the "SLE-15-SP1-Packages" medium instead of
+ the old "SLE-15-Packages" (bsc#1108620)
+- 4.1.3
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-4.1.2.tar.bz2
New:
----
yast2-registration-4.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.eUamNU/_old 2018-11-01 18:57:22.901979397 +0100
+++ /var/tmp/diff_new_pack.eUamNU/_new 2018-11-01 18:57:22.905979398 +0100
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.1.2
+Version: 4.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -99,5 +99,6 @@
%{yast_libdir}/yast
%{yast_libdir}/yast/suse_connect.rb
%doc %{yast_docdir}
+%license COPYING
%changelog
++++++ yast2-registration-4.1.2.tar.bz2 -> yast2-registration-4.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.2/package/yast2-registration.changes new/yast2-registration-4.1.5/package/yast2-registration.changes
--- old/yast2-registration-4.1.2/package/yast2-registration.changes 2018-09-04 12:42:19.000000000 +0200
+++ new/yast2-registration-4.1.5/package/yast2-registration.changes 2018-10-16 17:43:09.000000000 +0200
@@ -1,4 +1,33 @@
-------------------------------------------------------------------
+Tue Oct 16 15:35:43 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Fri Oct 12 10:41:27 CEST 2018 - schubi(a)suse.de
+
+- Added tags full_system_media_name and full_system_download_url
+ in control.xml which describe the location for the
+ "all-packages" medium. This information will be shown if the
+ registration has been scipped by the user. No hint will be shown
+ if these tags have not been defined. (fate#325834)
+- 4.1.5
+
+-------------------------------------------------------------------
+Thu Oct 11 14:55:15 UTC 2018 - lslezak(a)suse.cz
+
+- CRLF control characters cannot be included in the registration
+ code, added validation check (bsc#1111419)
+- 4.1.4
+
+-------------------------------------------------------------------
+Mon Sep 17 08:54:19 UTC 2018 - lslezak(a)suse.cz
+
+- Suggest downloading the "SLE-15-SP1-Packages" medium instead of
+ the old "SLE-15-Packages" (bsc#1108620)
+- 4.1.3
+
+-------------------------------------------------------------------
Tue Sep 4 08:34:31 UTC 2018 - dgonzalez(a)suse.com
- Limit the registration code size to 512 characters (bsc#1098576)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.2/package/yast2-registration.spec new/yast2-registration-4.1.5/package/yast2-registration.spec
--- old/yast2-registration-4.1.2/package/yast2-registration.spec 2018-09-04 12:42:19.000000000 +0200
+++ new/yast2-registration-4.1.5/package/yast2-registration.spec 2018-10-16 17:43:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-registration
-Version: 4.1.2
+Version: 4.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -100,5 +100,6 @@
%{yast_libdir}/yast
%{yast_libdir}/yast/suse_connect.rb
%doc %{yast_docdir}
+%license COPYING
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.2/src/lib/registration/ui/base_system_registration_dialog.rb new/yast2-registration-4.1.5/src/lib/registration/ui/base_system_registration_dialog.rb
--- old/yast2-registration-4.1.2/src/lib/registration/ui/base_system_registration_dialog.rb 2018-09-04 12:42:19.000000000 +0200
+++ new/yast2-registration-4.1.5/src/lib/registration/ui/base_system_registration_dialog.rb 2018-10-16 17:43:09.000000000 +0200
@@ -31,6 +31,7 @@
Yast.import "Wizard"
Yast.import "Popup"
Yast.import "Report"
+ Yast.import "ProductFeatures"
WIDGETS = {
register_scc: [:email, :reg_code],
@@ -361,17 +362,32 @@
#
# @return [Boolean] true when skipping has been confirmed
def show_skipping_warning
+ media_name = ProductFeatures.GetStringFeature(
+ "globals",
+ "full_system_media_name"
+ )
+ download_url = ProductFeatures.GetStringFeature(
+ "globals",
+ "full_system_download_url"
+ )
+
+ warning = _("Without registration, update channels will not be\n" \
+ "configured. This disables updates and security fixes.")
+
# Popup question: confirm skipping the registration
# TRANSLATORS:
# %{media_name} is the media name (e.g. SLE-15-Packages),
# %{download_url} is an URL link (e.g. https://download.suse.com)
- warning = _("Without registration, update channels will not be\n" \
- "configured. This disables updates and security fixes.\n\n" \
- "A full system can be installed using the\n" \
- "%{media_name} media from %{download_url}.\n" \
- "Without these media only a minimum system is available\n" \
- "in this installation.") %
- { media_name: "SLE-15-Packages", download_url: "https://download.suse.com" }
+ if !media_name.empty? && # cannot be nil
+ !download_url.empty? # cannot be nil
+ warning += "\n\n" +
+ _("A full system can be installed using the\n" \
+ "%{media_name} media from %{download_url}.\n" \
+ "Without these media only a minimum system is available\n" \
+ "in this installation.") %
+ { media_name: media_name, download_url: download_url }
+ end
+
Yast::Popup.Warning(warning)
end
@@ -548,6 +564,19 @@
end
end
+ def validate_register_scc
+ reg_code = Yast::UI.QueryWidget(:reg_code, :Value)
+
+ # no CR or LF control characters, they cannot be used in HTTP header fields
+ if reg_code.include?("\n") || reg_code.include?("\r")
+ # TRANSLATORS: error message, the entered registration code is not valid.
+ Yast::Report.Error(_("Invalid registration code.\nCRLF characters are not allowed."))
+ false
+ else
+ true
+ end
+ end
+
VALID_CUSTOM_URL_SCHEMES = ["http", "https"].freeze
# Determine whether an URL is valid and suitable to be used as local SMT server
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-4.1.2/test/base_system_registration_dialog_test.rb new/yast2-registration-4.1.5/test/base_system_registration_dialog_test.rb
--- old/yast2-registration-4.1.2/test/base_system_registration_dialog_test.rb 2018-09-04 12:42:19.000000000 +0200
+++ new/yast2-registration-4.1.5/test/base_system_registration_dialog_test.rb 2018-10-16 17:43:09.000000000 +0200
@@ -57,7 +57,7 @@
it "registers the base system with provided email and reg. code" do
expect(Yast::UI).to receive(:QueryWidget).with(:email, :Value)
.and_return(email)
- expect(Yast::UI).to receive(:QueryWidget).with(:reg_code, :Value)
+ allow(Yast::UI).to receive(:QueryWidget).with(:reg_code, :Value)
.and_return(reg_code)
expect(Yast::UI).to receive(:UserInput).and_return(:next)
@@ -81,7 +81,7 @@
it "does not register the system" do
expect(Yast::UI).to receive(:QueryWidget).with(:email, :Value)
.and_return(email)
- expect(Yast::UI).to receive(:QueryWidget).with(:reg_code, :Value)
+ allow(Yast::UI).to receive(:QueryWidget).with(:reg_code, :Value)
.and_return(reg_code)
expect(Yast::UI).to receive(:UserInput).and_return(:next, :abort)
expect(Registration::UI::AbortConfirmation).to receive(:run).and_return(true)
@@ -99,6 +99,22 @@
end
end
+ context "when user enters an invalid regcode" do
+ # include CRLF characters which are not allowed
+ let(:reg_code) { "\nmy-reg-code\r" }
+ it "displays error popup and does not register the system" do
+ allow(Yast::UI).to receive(:QueryWidget).with(:reg_code, :Value)
+ .and_return(reg_code)
+ allow(Yast::UI).to receive(:UserInput).and_return(:next, :abort)
+ allow(Registration::UI::AbortConfirmation).to receive(:run).and_return(true)
+
+ expect(Yast::Report).to receive(:Error).with(/Invalid registration code/)
+ expect(registration_ui).to_not receive(:register_system_and_base_product)
+
+ subject.run
+ end
+ end
+
context "when user sets a registration URL through regurl= parameter" do
let(:regurl) { "https://example.suse.net" }
@@ -109,7 +125,7 @@
it "uses the given URL to register the system" do
expect(Yast::UI).to receive(:QueryWidget).with(:email, :Value)
.and_return(email)
- expect(Yast::UI).to receive(:QueryWidget).with(:reg_code, :Value)
+ allow(Yast::UI).to receive(:QueryWidget).with(:reg_code, :Value)
.and_return(reg_code)
expect(Yast::UI).to receive(:UserInput).and_return(:next)
@@ -163,12 +179,41 @@
end
context "when user skips registration" do
- it "does not try to register the system and close the dialog" do
+ before do
allow(Yast::UI).to receive(:UserInput).and_return(:skip_registration, :next)
+ end
+
+ it "does not try to register the system and close the dialog" do
expect(Yast::Popup).to receive(:Warning).with(/Without registration/)
.and_return(true)
expect(subject.run).to eq(:skip)
end
+
+ context "when full_system_media_name and full_system_download_url" \
+ " is defined in control.xml" do
+ it "reports the media name and the regarding download url to the user" do
+ expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals", "full_system_media_name").and_return("SLE-15-Packages")
+ expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals", "full_system_download_url").and_return("https://download.suse.com")
+ expect(Yast::Popup).to receive(:Warning).with(/SLE-15-Packages.*download.suse.com/)
+ expect(subject.run).to eq(:skip)
+ end
+ end
+
+ context "when full_system_media_name and full_system_download_url" \
+ " is NOT defined in control.xml" do
+ it "does not mention any media information" do
+ expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals", "full_system_media_name").and_return("")
+ expect(Yast::ProductFeatures).to receive(:GetStringFeature)
+ .with("globals", "full_system_download_url").and_return("")
+ expect(Yast::Popup).to receive(:Warning).with(/Without registration/)
+ .and_return(true)
+ expect(Yast::Popup).not_to receive(:Warning).with(/Without these media only/)
+ expect(subject.run).to eq(:skip)
+ end
+ end
end
end
1
0
Hello community,
here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2018-11-01 18:56:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old)
and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-services-manager"
Thu Nov 1 18:56:43 2018 rev:43 rq:642403 version:4.1.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2018-09-07 15:34:55.630831163 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes 2018-11-01 18:56:46.741975842 +0100
@@ -1,0 +2,14 @@
+Tue Oct 16 15:28:34 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 19 20:39:00 UTC 2018 - knut.anderssen(a)suse.com
+
+- Adapted to use the Y2Firewall::Firewalld::Zone object returned by
+ Y2Firewall::Firewalld::Interface#zone instead of a String.
+- Adapted to use the new Y2Firewall::Firewalld::Interface objects
+ instead of a hash (fate#324662)
+- 4.1.8
+
+-------------------------------------------------------------------
Old:
----
yast2-services-manager-4.1.7.tar.bz2
New:
----
yast2-services-manager-4.1.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-services-manager.spec ++++++
--- /var/tmp/diff_new_pack.wgf9pD/_old 2018-11-01 18:56:47.121975880 +0100
+++ /var/tmp/diff_new_pack.wgf9pD/_new 2018-11-01 18:56:47.125975881 +0100
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.1.7
+Version: 4.1.8
Release: 0
BuildArch: noarch
@@ -32,8 +32,8 @@
Source0: %{name}-%{version}.tar.bz2
Requires: ruby
-# Yast2::Systemd::Target
-Requires: yast2 >= 4.1.3
+# Yast2::Firewalld::Interface#zone returns a Zone object
+Requires: yast2 >= 4.1.17
Requires: yast2-ruby-bindings >= 1.2.0
# To show service logs
Suggests: yast2-journal >= 4.1.1
@@ -45,8 +45,8 @@
BuildRequires: ruby
BuildRequires: update-desktop-files
-# Yast2::Systemd::Target
-BuildRequires: yast2 >= 4.1.3
+# Yast2::Firewalld::Interface#zone returns a Zone object
+BuildRequires: yast2 >= 4.1.17
BuildRequires: yast2-ruby-bindings >= 1.2.0
# To show service logs
BuildRequires: yast2-journal >= 4.1.1
@@ -98,6 +98,6 @@
%{_prefix}/share/applications/YaST2/services-manager.desktop
%_docdir/%name/
-%_docdir/%name/COPYING
+%license COPYING
%changelog
++++++ yast2-services-manager-4.1.7.tar.bz2 -> yast2-services-manager-4.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.7/package/yast2-services-manager.changes new/yast2-services-manager-4.1.8/package/yast2-services-manager.changes
--- old/yast2-services-manager-4.1.7/package/yast2-services-manager.changes 2018-09-05 11:02:19.000000000 +0200
+++ new/yast2-services-manager-4.1.8/package/yast2-services-manager.changes 2018-10-16 17:43:02.000000000 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Tue Oct 16 15:28:34 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Sep 19 20:39:00 UTC 2018 - knut.anderssen(a)suse.com
+
+- Adapted to use the Y2Firewall::Firewalld::Zone object returned by
+ Y2Firewall::Firewalld::Interface#zone instead of a String.
+- Adapted to use the new Y2Firewall::Firewalld::Interface objects
+ instead of a hash (fate#324662)
+- 4.1.8
+
+-------------------------------------------------------------------
Wed Sep 5 08:47:10 UTC 2018 - igonzalezsosa(a)suse.com
- Bring back the ServicesManagerTargetClass#modified= method
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.7/package/yast2-services-manager.spec new/yast2-services-manager-4.1.8/package/yast2-services-manager.spec
--- old/yast2-services-manager-4.1.7/package/yast2-services-manager.spec 2018-09-05 11:02:19.000000000 +0200
+++ new/yast2-services-manager-4.1.8/package/yast2-services-manager.spec 2018-10-16 17:43:02.000000000 +0200
@@ -24,7 +24,7 @@
######################################################################
Name: yast2-services-manager
-Version: 4.1.7
+Version: 4.1.8
Release: 0
BuildArch: noarch
@@ -32,8 +32,8 @@
Source0: %{name}-%{version}.tar.bz2
Requires: ruby
-# Yast2::Systemd::Target
-Requires: yast2 >= 4.1.3
+# Yast2::Firewalld::Interface#zone returns a Zone object
+Requires: yast2 >= 4.1.17
Requires: yast2-ruby-bindings >= 1.2.0
# To show service logs
Suggests: yast2-journal >= 4.1.1
@@ -45,8 +45,8 @@
BuildRequires: ruby
BuildRequires: update-desktop-files
-# Yast2::Systemd::Target
-BuildRequires: yast2 >= 4.1.3
+# Yast2::Firewalld::Interface#zone returns a Zone object
+BuildRequires: yast2 >= 4.1.17
BuildRequires: yast2-ruby-bindings >= 1.2.0
# To show service logs
BuildRequires: yast2-journal >= 4.1.1
@@ -98,4 +98,4 @@
%{_prefix}/share/applications/YaST2/services-manager.desktop
%_docdir/%name/
-%_docdir/%name/COPYING
+%license COPYING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-4.1.7/src/clients/services_proposal.rb new/yast2-services-manager-4.1.8/src/clients/services_proposal.rb
--- old/yast2-services-manager-4.1.7/src/clients/services_proposal.rb 2018-09-05 11:02:19.000000000 +0200
+++ new/yast2-services-manager-4.1.8/src/clients/services_proposal.rb 2018-10-16 17:43:02.000000000 +0200
@@ -315,7 +315,7 @@
end
def open_firewall_ports plugins
- zone_names = known_interfaces.map { |i| i["zone"] || firewalld.default_zone }
+ zone_names = known_interfaces.map { |i| (i.zone || default_zone).name }
zones = if zone_names.empty?
firewalld.zones.select { |z| !["block", "drop", "trusted"].include?(z.name) }
1
0
Hello community,
here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2018-11-01 18:56:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old)
and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on"
Thu Nov 1 18:56:08 2018 rev:95 rq:642398 version:4.1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2018-09-04 22:51:24.372022454 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2018-11-01 18:56:09.973972136 +0100
@@ -1,0 +2,13 @@
+Tue Oct 16 13:17:31 CEST 2018 - schubi(a)suse.de
+
+- Fixed path to license file. . Build error in bsc#1108139.
+- 4.1.7
+
+-------------------------------------------------------------------
+Wed Sep 12 15:50:58 UTC 2018 - dgonzalez(a)suse.com
+
+- Fix and improve the repo name selection in the AddOn auto client
+ (bsc#1108139)
+- 4.1.6
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-4.1.5.tar.bz2
New:
----
yast2-add-on-4.1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.o9YX21/_old 2018-11-01 18:56:10.397972179 +0100
+++ /var/tmp/diff_new_pack.o9YX21/_new 2018-11-01 18:56:10.397972179 +0100
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 4.1.5
+Version: 4.1.7
Release: 0
Summary: YaST2 - Add-On media installation code
License: GPL-2.0-only
@@ -72,7 +72,7 @@
%{yast_desktopdir}/*.desktop
%{yast_schemadir}/autoyast/rnc/add-on.rnc
%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/CONTRIBUTING.md
%doc %{yast_docdir}/README.md
++++++ yast2-add-on-4.1.5.tar.bz2 -> yast2-add-on-4.1.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/package/yast2-add-on.changes new/yast2-add-on-4.1.7/package/yast2-add-on.changes
--- old/yast2-add-on-4.1.5/package/yast2-add-on.changes 2018-08-31 09:28:43.000000000 +0200
+++ new/yast2-add-on-4.1.7/package/yast2-add-on.changes 2018-10-16 17:42:40.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Tue Oct 16 13:17:31 CEST 2018 - schubi(a)suse.de
+
+- Fixed path to license file. . Build error in bsc#1108139.
+- 4.1.7
+
+-------------------------------------------------------------------
+Wed Sep 12 15:50:58 UTC 2018 - dgonzalez(a)suse.com
+
+- Fix and improve the repo name selection in the AddOn auto client
+ (bsc#1108139)
+- 4.1.6
+
+-------------------------------------------------------------------
Thu Aug 30 08:50:09 UTC 2018 - dgonzalez(a)suse.com
- Fix the run of AddOn auto client (bsc#1106536).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/package/yast2-add-on.spec new/yast2-add-on-4.1.7/package/yast2-add-on.spec
--- old/yast2-add-on-4.1.5/package/yast2-add-on.spec 2018-08-31 09:28:43.000000000 +0200
+++ new/yast2-add-on-4.1.7/package/yast2-add-on.spec 2018-10-16 17:42:40.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-add-on
-Version: 4.1.5
+Version: 4.1.7
Release: 0
Summary: YaST2 - Add-On media installation code
License: GPL-2.0-only
@@ -72,7 +72,7 @@
%{yast_desktopdir}/*.desktop
%{yast_schemadir}/autoyast/rnc/add-on.rnc
%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/CONTRIBUTING.md
%doc %{yast_docdir}/README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/src/lib/add-on/clients/add-on_auto.rb new/yast2-add-on-4.1.7/src/lib/add-on/clients/add-on_auto.rb
--- old/yast2-add-on-4.1.5/src/lib/add-on/clients/add-on_auto.rb 2018-08-31 09:28:43.000000000 +0200
+++ new/yast2-add-on-4.1.7/src/lib/add-on/clients/add-on_auto.rb 2018-10-16 17:42:40.000000000 +0200
@@ -324,12 +324,12 @@
add_on_name = add_on.fetch("name", nil)
# name in control file, bnc#433981
- return add_on_name unless add_on_name.nil? || add_on_name.empty?
+ return add_on_name unless add_on_name.to_s.empty?
- media = add_on.fetch("media")
- product_dir = add_on.fetch("product_dir")
- expanded_url = Pkg.ExpandedUrl(media)
- repos_at_url = Pkg.RepositoryScan(expanded_url)
+ media_url = add_on.fetch("media_url", "")
+ product_dir = add_on.fetch("product_dir", "/")
+ expanded_url = Pkg.ExpandedUrl(media_url)
+ repos_at_url = Pkg.RepositoryScan(expanded_url) || []
# {Pkg.RepositoryScan} output: [["Product Name", "Path"], ...]
found_repo = repos_at_url.find { |r| r[1] == product_dir }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/test/y2add_on/clients/add-on_auto_test.rb new/yast2-add-on-4.1.7/test/y2add_on/clients/add-on_auto_test.rb
--- old/yast2-add-on-4.1.5/test/y2add_on/clients/add-on_auto_test.rb 2018-08-31 09:28:43.000000000 +0200
+++ new/yast2-add-on-4.1.7/test/y2add_on/clients/add-on_auto_test.rb 2018-10-16 17:42:40.000000000 +0200
@@ -245,7 +245,6 @@
"alias" => "produc_alias",
"ask_on_error" => ask_on_error,
"media_url" => "RELURL://product.url",
- "name" => "updated_repo",
"priority" => 20,
"product_dir" => "/"
}
@@ -258,7 +257,7 @@
"autorefresh" => true,
"enabled" => true,
"keeppackaged" => false,
- "name" => "updated_repo",
+ "name" => "Updated repo",
"priority" => 20,
"service" => ""
},
@@ -279,9 +278,13 @@
allow(Yast::Pkg).to receive(:SourceEditSet)
allow(Yast::Pkg).to receive(:SourceCreate).and_return(1)
allow(Yast::Pkg).to receive(:SourceEditGet).and_return(repos)
+ allow(Yast::Pkg).to receive(:ExpandedUrl)
+ # To test indirectly the "preferred_name_for" method
+ allow(Yast::Pkg).to receive(:RepositoryScan)
+ .with(anything)
+ .and_return([["Updated repo", "/"]])
end
- # FIXME: improve that WIP scenarios/contexts
context "and product creation fails" do
before do
allow(Yast::Pkg).to receive(:SourceCreate).and_return(-1)
1
0
Hello community,
here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2018-11-01 18:55:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ntp-client"
Thu Nov 1 18:55:34 2018 rev:107 rq:642235 version:4.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2018-09-04 22:50:13.899780556 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new/yast2-ntp-client.changes 2018-11-01 18:55:38.289969172 +0100
@@ -1,0 +2,20 @@
+Tue Oct 16 10:28:35 CEST 2018 - schubi(a)suse.de
+
+- Fixed license path. Build error for bsc#1110598.
+- 4.1.3
+
+-------------------------------------------------------------------
+Wed Oct 3 14:11:34 UTC 2018 - knut.anderssen(a)suse.com
+
+- AutoYaST: Do not show the progress when merging the configuration
+ before writing it (bsc#1110598)
+- 4.1.2
+
+-------------------------------------------------------------------
+Fri Sep 7 15:20:26 UTC 2018 - dgonzalez(a)suse.com
+
+- Save the service status according to the user preferences
+ (bsc#1075039)
+- 4.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-4.1.0.tar.bz2
New:
----
yast2-ntp-client-4.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.8DXqEY/_old 2018-11-01 18:55:39.217969248 +0100
+++ /var/tmp/diff_new_pack.8DXqEY/_new 2018-11-01 18:55:39.221969249 +0100
@@ -17,7 +17,7 @@
Name: yast2-ntp-client
-Version: 4.1.0
+Version: 4.1.3
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0-or-later
@@ -82,7 +82,7 @@
%ghost /etc/cron.d/suse-ntp_synchronize
%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
++++++ yast2-ntp-client-4.1.0.tar.bz2 -> yast2-ntp-client-4.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.0/package/yast2-ntp-client.changes new/yast2-ntp-client-4.1.3/package/yast2-ntp-client.changes
--- old/yast2-ntp-client-4.1.0/package/yast2-ntp-client.changes 2018-08-23 09:42:03.000000000 +0200
+++ new/yast2-ntp-client-4.1.3/package/yast2-ntp-client.changes 2018-10-16 11:03:32.000000000 +0200
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Tue Oct 16 10:28:35 CEST 2018 - schubi(a)suse.de
+
+- Fixed license path. Build error for bsc#1110598.
+- 4.1.3
+
+-------------------------------------------------------------------
+Wed Oct 3 14:11:34 UTC 2018 - knut.anderssen(a)suse.com
+
+- AutoYaST: Do not show the progress when merging the configuration
+ before writing it (bsc#1110598)
+- 4.1.2
+
+-------------------------------------------------------------------
+Fri Sep 7 15:20:26 UTC 2018 - dgonzalez(a)suse.com
+
+- Save the service status according to the user preferences
+ (bsc#1075039)
+- 4.1.1
+
+-------------------------------------------------------------------
Wed Aug 22 16:08:46 CEST 2018 - schubi(a)suse.de
- Switched license in spec file from SPDX2 to SPDX3 format.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.0/package/yast2-ntp-client.spec new/yast2-ntp-client-4.1.3/package/yast2-ntp-client.spec
--- old/yast2-ntp-client-4.1.0/package/yast2-ntp-client.spec 2018-08-23 09:42:03.000000000 +0200
+++ new/yast2-ntp-client-4.1.3/package/yast2-ntp-client.spec 2018-10-16 11:03:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-ntp-client
-Version: 4.1.0
+Version: 4.1.3
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0-or-later
@@ -82,7 +82,7 @@
%ghost /etc/cron.d/suse-ntp_synchronize
%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.0/src/clients/ntp-client_proposal.rb new/yast2-ntp-client-4.1.3/src/clients/ntp-client_proposal.rb
--- old/yast2-ntp-client-4.1.0/src/clients/ntp-client_proposal.rb 2018-08-23 09:42:03.000000000 +0200
+++ new/yast2-ntp-client-4.1.3/src/clients/ntp-client_proposal.rb 2018-10-16 11:03:32.000000000 +0200
@@ -329,57 +329,50 @@
true
end
- # params:
- # server (taken from UI if empty)
- # servers (intended to use all of opensuse.pool.ntp.org,
- # but I did not have time to make it work)
- # run_service (set to true if empty)
- # write_only (bnc#589296)
- # ntpdate_only (TODO rename to onetime)
- # return:
- # `success, `invalid_hostname or `ntpdate_failed
- def Write(param)
- log.info "ntp client proposal Write with #{param.inspect}"
- ntp_servers = param["servers"] || []
- ntp_server = param["server"] || ""
- run_service = param.fetch("run_service", true)
- if ntp_server == ""
- # get the value from UI only when it wasn't given as a parameter
- ntp_server = UI.QueryWidget(Id(:ntp_address), :Value)
- end
- return :invalid_hostname if !ValidateSingleServer(ntp_server)
+ # Writes the NTP settings
+ #
+ # @param [Hash] params
+ # @option params [String] "server" The NTP server address, taken from the UI if empty
+ # @option params [Array<String>] "servers" A collection of NTP servers
+ # @option params [Boolean] "run_service" Whether service should be active and enable
+ # @option params [Boolean] "write_only" If only is needed to write the settings, (bnc#589296)
+ # @option params [Boolean] "ntpdate_only" ? TODO: rename to onetime
+ #
+ # @return [Symbol] :invalid_hostname, when a not valid ntp_server is given
+ # :ntpdate_failed, when the ntp sychronization fails
+ # :success, when settings (and sync if proceed) were performed successfully
+ def Write(params)
+ log.info "ntp client proposal Write with #{params.inspect}"
+
+ # clean params
+ params.compact!
+
+ ntp_server = params.fetch("server", "")
+ ntp_servers = params.fetch("servers", [])
+ run_service = params.fetch("run_service", NtpClient.run_service)
+
+ # Get the ntp_server value from UI only if isn't present (probably wasn't given as parameter)
+ ntp_server = UI.QueryWidget(Id(:ntp_address), :Value) if ntp_server.strip.empty?
+
+ return :invalid_hostname unless ValidateSingleServer(ntp_server)
WriteNtpSettings(ntp_servers, ntp_server, run_service)
- return :success if param["write_only"]
- # In 1st stage, schedule packages for installation
- if Stage.initial
- Yast.import "Packages"
- Packages.addAdditionalPackage(NtpClientClass::REQUIRED_PACKAGE)
- # Otherwise, prompt user for confirming pkg installation
- elsif !PackageSystem.CheckAndInstallPackages([NtpClientClass::REQUIRED_PACKAGE])
- Report.Error(
- Builtins.sformat(
- _(
- "Synchronization with NTP server is not possible\nwithout package %1 installed."
- ),
- NtpClientClass::REQUIRED_PACKAGE
- )
- )
- end
+ return :success if params["write_only"]
+
+ add_or_install_required_package
- ret = 0
+ # Only if network is running try to synchronize the ntp server
if NetworkService.isNetworkRunning
- # Only if network is running try to synchronize the ntp server
Popup.ShowFeedback("", _("Synchronizing with NTP server..."))
- ret = NtpClient.sync_once(ntp_server)
+ exit_code = NtpClient.sync_once(ntp_server)
Popup.ClearFeedback
- end
- return :ntpdate_failed if ret != 0
+ return :ntpdate_failed unless exit_code.zero?
+ end
# User wants more than running one time sync (synchronize on boot)
- WriteNtpSettings(ntp_servers, ntp_server, run_service) if !param["ntpdate_only"]
+ WriteNtpSettings(ntp_servers, ntp_server, run_service) unless params["ntpdate_only"]
:success
end
@@ -469,6 +462,24 @@
# success, exit
true
end
+
+ private
+
+ def add_or_install_required_package
+ # In 1st stage, schedule packages for installation
+ if Stage.initial
+ Yast.import "Packages"
+ Packages.addAdditionalPackage(NtpClientClass::REQUIRED_PACKAGE)
+ # Otherwise, prompt user for confirming pkg installation
+ elsif !PackageSystem.CheckAndInstallPackages([NtpClientClass::REQUIRED_PACKAGE])
+ Report.Error(
+ Builtins.sformat(
+ _("Synchronization with NTP server is not possible\nwithout package %1 installed."),
+ NtpClientClass::REQUIRED_PACKAGE
+ )
+ )
+ end
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.0/src/lib/y2ntp_client/client/auto.rb new/yast2-ntp-client-4.1.3/src/lib/y2ntp_client/client/auto.rb
--- old/yast2-ntp-client-4.1.0/src/lib/y2ntp_client/client/auto.rb 2018-08-23 09:42:03.000000000 +0200
+++ new/yast2-ntp-client-4.1.3/src/lib/y2ntp_client/client/auto.rb 2018-10-16 11:03:32.000000000 +0200
@@ -39,9 +39,9 @@
end
def write
+ progress_orig = Yast::Progress.set(false)
# ensure to merge config to system chrony configuration to do minimal configuration
Yast::NtpClient.merge_to_system
- progress_orig = Yast::Progress.set(false)
Yast::NtpClient.write_only = true
ret = Yast::NtpClient.Write
Yast::Progress.set(progress_orig)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.1.0/test/ntp_client_proposal_test.rb new/yast2-ntp-client-4.1.3/test/ntp_client_proposal_test.rb
--- old/yast2-ntp-client-4.1.0/test/ntp_client_proposal_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ntp-client-4.1.3/test/ntp_client_proposal_test.rb 2018-10-16 11:03:32.000000000 +0200
@@ -0,0 +1,169 @@
+require_relative "test_helper"
+
+require_relative "../src/clients/ntp-client_proposal.rb"
+
+Yast.import "Packages"
+
+describe Yast::NtpClientProposalClient do
+ subject do
+ client = described_class.new
+ client.main
+ client
+ end
+
+ describe "#Write" do
+ let(:ntp_server) { "fake.pool.ntp.org" }
+ let(:write_only) { false }
+ let(:ntpdate_only) { true }
+ let(:params) do
+ {
+ "server" => ntp_server,
+ "write_only" => write_only,
+ "ntpdate_only" => ntpdate_only
+ }
+ end
+ let(:ntp_client) { Yast::NtpClient }
+ let(:initial_stage) { false }
+ let(:network_running) { false }
+
+ before do
+ allow(subject).to receive(:WriteNtpSettings)
+
+ allow(Yast::Stage).to receive(:initial).and_return(initial_stage)
+ allow(Yast::PackageSystem).to receive(:CheckAndInstallPackages)
+ allow(Yast::Report).to receive(:Error)
+ allow(Yast::NetworkService).to receive(:isNetworkRunning).and_return(network_running)
+ end
+
+ context "with a not valid hostname" do
+ let(:ntp_server) { nil }
+
+ it "does not write settings" do
+ expect(subject).to_not receive(:WriteNtpSettings)
+
+ subject.Write(params)
+ end
+
+ it "returns :invalid_hostname" do
+ expect(subject.Write(params)).to eq(:invalid_hostname)
+ end
+ end
+
+ context "with valid hostname" do
+ before do
+ allow(subject).to receive(:ValidateSingleServer).and_return(true)
+ end
+
+ context "but in 'write_only' mode" do
+ let(:write_only) { true }
+
+ it "only writes settings" do
+ expect(subject).to receive(:WriteNtpSettings).once
+ expect(Yast::Stage).to_not receive(:initial)
+ expect(Yast::NetworkService).to_not receive(:isNetworkRunning)
+
+ subject.Write(params)
+ end
+
+ it "returns :success" do
+ expect(subject.Write(params)).to eq(:success)
+ end
+ end
+
+ context "but 'run_service' param is not given" do
+ it "uses the current value of NtpClient.run_service" do
+ ntp_client.run_service = true
+ expect(subject).to receive(:WriteNtpSettings).with(anything, anything, true)
+ subject.Write({})
+
+ ntp_client.run_service = false
+ expect(subject).to receive(:WriteNtpSettings).with(anything, anything, false)
+ subject.Write({})
+ end
+ end
+
+ context "and is in the initial stage" do
+ let(:initial_stage) { true }
+
+ it "imports Yast::Packages" do
+ allow(Yast).to receive(:import).and_call_original
+ expect(Yast).to receive(:import).with("Packages")
+
+ subject.Write(params)
+ end
+
+ it "adds the additional package" do
+ expect(Yast::Packages).to receive(:addAdditionalPackage)
+
+ subject.Write(params)
+ end
+ end
+
+ context "and is not in the initial stage" do
+ it "asks user to confirm the package installation" do
+ expect(Yast::PackageSystem).to receive(:CheckAndInstallPackages)
+
+ subject.Write(params)
+ end
+
+ context "but user rejects the package installation" do
+ before do
+ allow(Yast::PackageSystem).to receive(:CheckAndInstallPackages).and_return(false)
+ end
+
+ it "reports an error" do
+ expect(Yast::Report).to receive(:Error).with(/Synchronization with NTP server is not/)
+
+ subject.Write(params)
+ end
+ end
+ end
+
+ context "and network is not available" do
+ it "does not performs the ntp syncronization" do
+ expect(Yast::NtpClient).to_not receive(:sync_once)
+
+ subject.Write(params)
+ end
+
+ it "returns :success" do
+ expect(subject.Write(params)).to eq(:success)
+ end
+ end
+
+ context "and network is available" do
+ let(:network_running) { true }
+
+ it "returns :ntpdate_failed if synchronization fails" do
+ allow(Yast::NtpClient).to receive(:sync_once).with(ntp_server).and_return(1)
+
+ expect(subject.Write(params)).to eq(:ntpdate_failed)
+ end
+
+ it "returns :success if syncronization was successfully" do
+ allow(Yast::NtpClient).to receive(:sync_once).with(ntp_server).and_return(0)
+
+ expect(subject.Write(params)).to eq(:success)
+ end
+ end
+
+ context "and user only wants to syncronize date" do
+ it "writes settings only once" do
+ expect(subject).to receive(:WriteNtpSettings).once
+
+ subject.Write(params)
+ end
+ end
+
+ context "and user wants to syncronize on boot" do
+ let(:ntpdate_only) { false }
+
+ it "writes settings again?" do
+ expect(subject).to receive(:WriteNtpSettings).twice
+
+ subject.Write(params)
+ end
+ end
+ end
+ end
+end
1
0
Hello community,
here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2018-11-01 18:55:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-CAASP"
Thu Nov 1 18:55:00 2018 rev:12 rq:642234 version:15.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-07-13 10:17:14.222161491 +0200
+++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2018-11-01 18:55:03.037966245 +0100
@@ -0,0 +1,15 @@
+Thu Oct 11 14:43:55 UTC 2018 - jmassaguerpla(a)suse.com
+
+- fix bsc#1111541: do not enable container-feeder since this does
+ not exist in caasp4.
+- 15.3
+
+-------------------------------------------------------------------
+Thu Oct 11 08:35:10 UTC 2018 - jmassaguerpla(a)suse.com
+
+- fix bsc#1110300 by running disc proposal before bootloader
+ Port of commit
+ https://github.com/yast/skelcd-control-Kubic/commit/3a28ac79d59b50200755990…
+ to CaaSP4
+- 15.2
+
Old:
----
skelcd-control-CAASP-15.1.tar.bz2
New:
----
skelcd-control-CAASP-15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-CAASP.spec ++++++
--- /var/tmp/diff_new_pack.QumWb2/_old 2018-11-01 18:55:03.517966285 +0100
+++ /var/tmp/diff_new_pack.QumWb2/_new 2018-11-01 18:55:03.529966286 +0100
@@ -112,7 +112,7 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.1
+Version: 15.3
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
++++++ skelcd-control-CAASP-15.1.tar.bz2 -> skelcd-control-CAASP-15.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.1/control/control.CAASP.xml new/skelcd-control-CAASP-15.3/control/control.CAASP.xml
--- old/skelcd-control-CAASP-15.1/control/control.CAASP.xml 2018-07-06 15:58:40.000000000 +0200
+++ new/skelcd-control-CAASP-15.3/control/control.CAASP.xml 2018-10-16 11:01:45.000000000 +0200
@@ -251,7 +251,6 @@
<id>dashboard_role</id>
<services config:type="list">
- <service><name>container-feeder</name></service>
<service><name>docker</name></service>
<service><name>etcd</name></service>
<service><name>kubelet</name></service>
@@ -269,7 +268,6 @@
<services config:type="list">
<service><name>docker</name></service>
- <service><name>container-feeder</name></service>
<service><name>salt-minion</name></service>
<service><name>systemd-timesyncd</name></service>
</services>
@@ -386,6 +384,10 @@
<enable_skip>no</enable_skip>
<proposal_modules config:type="list">
<proposal_module>
+ <name>partitions</name>
+ <presentation_order>10</presentation_order>
+ </proposal_module>
+ <proposal_module>
<name>bootloader</name>
<presentation_order>40</presentation_order>
</proposal_module>
@@ -394,10 +396,6 @@
<presentation_order>80</presentation_order>
</proposal_module>
<proposal_module>
- <name>partitions</name>
- <presentation_order>10</presentation_order>
- </proposal_module>
- <proposal_module>
<name>timezone</name>
<presentation_order>25</presentation_order>
</proposal_module>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.changes new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.changes
--- old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.changes 2018-07-06 15:58:40.000000000 +0200
+++ new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.changes 2018-10-16 11:01:45.000000000 +0200
@@ -1,3 +1,18 @@
+Thu Oct 11 14:43:55 UTC 2018 - jmassaguerpla(a)suse.com
+
+- fix bsc#1111541: do not enable container-feeder since this does
+ not exist in caasp4.
+- 15.3
+
+-------------------------------------------------------------------
+Thu Oct 11 08:35:10 UTC 2018 - jmassaguerpla(a)suse.com
+
+- fix bsc#1110300 by running disc proposal before bootloader
+ Port of commit
+ https://github.com/yast/skelcd-control-Kubic/commit/3a28ac79d59b50200755990…
+ to CaaSP4
+- 15.2
+
-------------------------------------------------------------------
Thu Jun 28 15:25:12 UTC 2018 - rbrown(a)suse.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.spec new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.spec
--- old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.spec 2018-07-06 15:58:40.000000000 +0200
+++ new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.spec 2018-10-16 11:01:45.000000000 +0200
@@ -112,7 +112,7 @@
Url: https://github.com/yast/skelcd-control-CAASP
AutoReqProv: off
-Version: 15.1
+Version: 15.3
Release: 0
Summary: The CaaSP control file needed for installation
License: MIT
1
0