openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- 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-packager for openSUSE:Factory checked in at 2018-11-01 19:11:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
and /work/SRC/openSUSE:Factory/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Thu Nov 1 19:11:42 2018 rev:359 rq:645892 version:4.1.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2018-09-04 22:51:38.064069421 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2018-11-01 19:11:46.174039546 +0100
@@ -1,0 +2,51 @@
+Thu Nov 1 08:11:38 UTC 2018 - Josef Reidinger <jreidinger(a)suse.com>
+
+- Set during upgrade proper release version for newly added repos
+ (bsc#1090193)
+- 4.1.11
+
+-------------------------------------------------------------------
+Wed Oct 31 08:35:29 UTC 2018 - Josef Reidinger <jreidinger(a)suse.com>
+
+- Allow specify alias for online repos (bsc#1017823)
+- Do not depend on yast2-installation (bsc#876533)
+- 4.1.10
+
+-------------------------------------------------------------------
+Tue Oct 16 11:33:07 CEST 2018 - schubi(a)suse.de
+
+- Fixed path to license file. Build error in bsc#1110913.
+- 4.1.9
+
+-------------------------------------------------------------------
+Mon Oct 8 08:12:54 UTC 2018 - lslezak(a)suse.cz
+
+- Ignore a read failure when backing up /var/log/YaST2, YaST might
+ be updating the logs while the archive is being created
+ (bsc#1110913)
+- 4.1.8
+
+-------------------------------------------------------------------
+Tue Sep 25 11:56:41 UTC 2018 - lslezak(a)suse.cz
+
+- Copy also the role packages from the self-update repository
+ (bsc#1101016)
+- 4.1.7
+
+-------------------------------------------------------------------
+Fri Sep 21 12:58:42 CEST 2018 - schubi(a)suse.de
+
+- add_on_products.xml : Added tag "confirm_license" to handle
+ Add-On-products licenses which will be added while installation.
+ (bsc#1105758)
+- 4.1.6
+
+-------------------------------------------------------------------
+Thu Sep 13 12:23:04 UTC 2018 - lslezak(a)suse.cz
+
+- Copy the selected packages from the self-update repository to an
+ additional add-on repository, allow updating the installation
+ workflow from the self-update repository (bsc#1101016)
+- 4.1.5
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-4.1.4.tar.bz2
New:
----
yast2-packager-4.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.alp9AF/_old 2018-11-01 19:11:46.646039567 +0100
+++ /var/tmp/diff_new_pack.alp9AF/_new 2018-11-01 19:11:46.650039567 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.1.4
+Version: 4.1.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -148,7 +148,7 @@
%{yast_scrconfdir}/*
%{yast_execcompdir}/servers_non_y2/ag_*
%dir %{yast_docdir}
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%doc %{yast_docdir}/CONTRIBUTING.md
++++++ yast2-packager-4.1.4.tar.bz2 -> yast2-packager-4.1.11.tar.bz2 ++++++
++++ 4995 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libstorage-ng for openSUSE:Factory checked in at 2018-11-01 19:11:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libstorage-ng (Old)
and /work/SRC/openSUSE:Factory/.libstorage-ng.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libstorage-ng"
Thu Nov 1 19:11:08 2018 rev:34 rq:645811 version:4.1.53
Changes:
--------
--- /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes 2018-09-10 12:36:25.938240365 +0200
+++ /work/SRC/openSUSE:Factory/.libstorage-ng.new/libstorage-ng.changes 2018-11-01 19:11:11.318037975 +0100
@@ -1,0 +2,251 @@
+Wed Oct 31 22:49:29 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Japanese)
+- 4.1.53
+
+--------------------------------------------------------------------
+Wed Oct 31 17:17:47 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Italian)
+- 4.1.52
+
+--------------------------------------------------------------------
+Wed Oct 31 17:17:05 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Catalan)
+- 4.1.51
+
+--------------------------------------------------------------------
+Wed Oct 31 14:14:58 UTC 2018 - shundhammer(a)suse.de
+
+- merge gh#openSUSE/libstorage-ng#588
+- Regenerated potfiles
+- 4.1.50
+
+--------------------------------------------------------------------
+Wed Oct 31 13:59:56 UTC 2018 - shundhammer(a)suse.de
+
+- merge gh#openSUSE/libstorage-ng#585
+- Fixed broken autobuild environment
+- Support for StrayBlkDevices in CompoundActions (bsc#1085134)
+- Moved predicates to base class
+- New unit test for Bcache compound actions
+- Use new check from superclass
+- Removed unnecessary include
+- Support for Bcache in CompoundActions
+- First (incomplete) CompoundAction formatter for Bcache
+- Fixed broken English
+- Use inherited methods
+- Use actual output for translator examples
+- Use multiple lines, not one neverending line
+- First complete CompoundAction formatter for Bcache
+- First unit test for MD-RAID compound actions
+- Added CompoundActions formatter for MD-RAIDs
+- More test cases for MD-RAID
+- User sanity check
+- Coding style cleanup
+- Updated year in useless legalese
+- Added missing sformat parameter
+- Added missing parameter doc in translator comment
+- Fixed translator comments
+- Moved device list formatting out to separate common function
+- Use better comparision function
+- Use existing constants
+- New CompoundActions
+
+--------------------------------------------------------------------
+Mon Oct 29 11:29:28 UTC 2018 - aschnell(a)suse.com
+
+- merge gh#openSUSE/libstorage-ng#587
+- extended documentation
+- ported check from snapper
+- minor improvements
+- 4.1.49
+
+--------------------------------------------------------------------
+Mon Oct 29 09:07:43 UTC 2018 - aschnell(a)suse.com
+
+- merge gh#openSUSE/libstorage-ng#586
+- mark AUTHORS as %doc
+
+--------------------------------------------------------------------
+Wed Oct 24 09:46:50 UTC 2018 - aschnell(a)suse.com
+
+- merge gh#openSUSE/libstorage-ng#584
+- mark LICENSE file as license
+- 4.1.48
+
+--------------------------------------------------------------------
+Tue Oct 23 12:54:38 UTC 2018 - shundhammer(a)suse.de
+
+- merge gh#openSUSE/libstorage-ng#583
+- Use predicates to make the code much better readable
+- Added missing return
+- Use speaking function names for getters
+- Moved methods to base class
+- Use predicates and speaking getters to make the code much better
+ readable (bsc#1085134)
+- 4.1.47
+
+--------------------------------------------------------------------
+Fri Oct 19 13:03:18 UTC 2018 - aschnell(a)suse.com
+
+- merge gh#openSUSE/libstorage-ng#582
+- make format of po files consistent with gettext
+- 4.1.46
+
+--------------------------------------------------------------------
+Thu Oct 18 15:15:30 UTC 2018 - jreidinger(a)suse.cz
+
+- merge gh#openSUSE/libstorage-ng#580
+- add bcache attributes (fate#325346)
+- [RFC] add bcache attributes (fate#325346)
+- 4.1.45
+
+--------------------------------------------------------------------
+Fri Oct 12 09:44:42 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Chinese (China))
+- 4.1.44
+
+--------------------------------------------------------------------
+Wed Oct 10 22:42:29 UTC 2018 - shundhammer(a)suse.de
+
+- merge gh#openSUSE/libstorage-ng#581
+- Added test case for weird UUID (bsc#1102572)
+- Whitespace
+- Fixed blkid output parser to honor escaped quotes (bsc#1102572)
+- Fixed blkid output parser to honor escaped quotes
+- 4.1.43
+
+--------------------------------------------------------------------
+Sun Oct 7 12:48:42 UTC 2018 - freek(a)opensuse.org
+
+- Translated using Weblate (Dutch)
+- 4.1.42
+
+--------------------------------------------------------------------
+Fri Oct 5 12:59:44 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Indonesian)
+- 4.1.41
+
+--------------------------------------------------------------------
+Fri Oct 5 07:01:02 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Indonesian)
+
+--------------------------------------------------------------------
+Fri Oct 5 07:01:01 UTC 2018 - jreidinger(a)suse.cz
+
+- merge gh#openSUSE/libstorage-ng#579
+- Use for bcache cset as display name string "bcache cache"
+ (fate#325346)
+- 4.1.40
+
+--------------------------------------------------------------------
+Tue Oct 2 15:33:51 UTC 2018 - aschnell(a)suse.com
+
+- merge gh#openSUSE/libstorage-ng#578
+- use predefined constants
+- 4.1.39
+
+--------------------------------------------------------------------
+Tue Oct 2 11:05:14 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Russian)
+- 4.1.38
+
+--------------------------------------------------------------------
+Thu Sep 27 06:59:09 UTC 2018 - jreidinger(a)suse.cz
+
+- merge gh#openSUSE/libstorage-ng#577
+- implement searching for free name for bcache (fate#325346)
+- 4.1.37
+
+--------------------------------------------------------------------
+Wed Sep 26 12:26:37 UTC 2018 - freek(a)opensuse.org
+
+- Translated using Weblate (Dutch)
+- 4.1.36
+
+--------------------------------------------------------------------
+Tue Sep 25 09:51:26 UTC 2018 - lslezak(a)suse.cz
+
+- merge gh#openSUSE/libstorage-ng#576
+- Added Travis ccache documentation
+- Added Travis ccache documentation and cache cleanup
+- 4.1.35
+
+--------------------------------------------------------------------
+Mon Sep 24 04:39:22 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- Translated using Weblate (Chinese (China))
+- 4.1.34
+
+--------------------------------------------------------------------
+Fri Sep 21 10:05:58 UTC 2018 - lslezak(a)suse.cz
+
+- merge gh#openSUSE/libstorage-ng#575
+- Use ccache in Travis builds
+- Use ccache in Travis builds (up to 4x faster)
+- 4.1.33
+
+--------------------------------------------------------------------
+Mon Sep 17 11:54:43 UTC 2018 - opensuse-packaging(a)opensuse.org
+
+- merge gh#openSUSE/libstorage-ng#574
++++ 54 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/libstorage-ng/libstorage-ng.changes
++++ and /work/SRC/openSUSE:Factory/.libstorage-ng.new/libstorage-ng.changes
Old:
----
libstorage-ng-4.1.24.tar.xz
New:
----
libstorage-ng-4.1.53.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libstorage-ng.spec ++++++
--- /var/tmp/diff_new_pack.lqemQv/_old 2018-11-01 19:11:11.734037994 +0100
+++ /var/tmp/diff_new_pack.lqemQv/_new 2018-11-01 19:11:11.738037994 +0100
@@ -18,7 +18,7 @@
%define libname %{name}1
Name: libstorage-ng
-Version: 4.1.24
+Version: 4.1.53
Release: 0
Summary: Library for storage management
License: GPL-2.0-only
@@ -183,7 +183,8 @@
%files -n %{libname}
%defattr(-,root,root)
-%doc AUTHORS LICENSE
+%doc AUTHORS
+%license LICENSE
%{_libdir}/libstorage-ng.so.*
%ghost /run/libstorage-ng
++++++ libstorage-ng-4.1.24.tar.xz -> libstorage-ng-4.1.53.tar.xz ++++++
++++ 80575 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package rubygem-rspec-expectations for openSUSE:Factory checked in at 2018-11-01 19:10:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-rspec-expectations (Old)
and /work/SRC/openSUSE:Factory/.rubygem-rspec-expectations.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-rspec-expectations"
Thu Nov 1 19:10:33 2018 rev:15 rq:645800 version:3.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-rspec-expectations/rubygem-rspec-expectations.changes 2017-11-01 11:08:08.461054867 +0100
+++ /work/SRC/openSUSE:Factory/.rubygem-rspec-expectations.new/rubygem-rspec-expectations.changes 2018-11-01 19:10:36.422036334 +0100
@@ -1,0 +2,52 @@
+Mon Oct 29 06:51:38 UTC 2018 - mschnitzer(a)suse.com
+
+- updated to version 3.8.2
+
+ [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.8.1...v3.8…
+
+ Bug Fixes:
+
+ * Change `include` matcher to rely on a `respond_to?(:include?)` check rather than a direct
+ Hash comparison before calling `to_hash` to convert to a hash. (Jordan Owens, #1073)
+ * Prevent unexpected call stack jumps from causing an obscure error (`IndexError`), and
+ replace that error with a proper informative message. (Jon Rowe, #1076)
+
+-------------------------------------------------------------------
+Fri Aug 10 10:59:44 UTC 2018 - mschnitzer(a)suse.com
+
+- updated to version 3.8.1
+
+ [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.8.0...v3.8…
+
+ Bug Fixes:
+
+ * Fix regression in `include` matcher so stopped
+ `expect(hash.with_indifferent_access).to include(:symbol_key)`
+ from working. (Eito Katagiri, #1069)
+
+-------------------------------------------------------------------
+Sun Aug 5 19:00:01 UTC 2018 - mschnitzer(a)suse.com
+
+- updated to version 3.8.0
+
+ [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.7.0...v3.8…
+
+ Enhancements:
+
+ * Improve failure message of `change(receiver, :message)` by including the
+ receiver as `SomeClass#some_message`. (Tomohiro Hashidate, #1005)
+ * Improve `change` matcher so that it can correctly detect changes in
+ deeply nested mutable objects (such as arrays-of-hashes-of-arrays).
+ The improved logic uses the before/after `hash` value to see if the
+ object has been mutated, rather than shallow duping the object.
+ (Myron Marston, #1034)
+ * Improve `include` matcher so that pseudo-hash objects (e.g. objects
+ that decorate a hash using a `SimpleDelegator` or similar) are treated
+ as a hash, as long as they implement `to_hash`. (Pablo Brasero, #1012)
+ * Add `max_formatted_output_length=` to configuration, allowing changing
+ the length at which we truncate large output strings.
+ (Sam Phippen #951, Benoit Tigeot #1056)
+ * Improve error message when passing a matcher that doesn't support block
+ expectations to a block based `expect`. (@nicktime, #1066)
+
+-------------------------------------------------------------------
Old:
----
rspec-expectations-3.7.0.gem
New:
----
rspec-expectations-3.8.2.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-rspec-expectations.spec ++++++
--- /var/tmp/diff_new_pack.TeBVjQ/_old 2018-11-01 19:10:37.070036365 +0100
+++ /var/tmp/diff_new_pack.TeBVjQ/_new 2018-11-01 19:10:37.070036365 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-rspec-expectations
#
-# 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
@@ -24,7 +24,7 @@
#
Name: rubygem-rspec-expectations
-Version: 3.7.0
+Version: 3.8.2
Release: 0
%define mod_name rspec-expectations
%define mod_full_name %{mod_name}-%{version}
++++++ rspec-expectations-3.7.0.gem -> rspec-expectations-3.8.2.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Changelog.md new/Changelog.md
--- old/Changelog.md 2017-10-17 17:13:31.000000000 +0200
+++ new/Changelog.md 2018-10-09 22:43:31.000000000 +0200
@@ -1,5 +1,42 @@
-### 3.8 Development
-[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.7.0...mast…
+### 3.8.2 / 2018-10-09
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.8.1...v3.8…
+
+Bug Fixes:
+
+* Change `include` matcher to rely on a `respond_to?(:include?)` check rather than a direct
+ Hash comparison before calling `to_hash` to convert to a hash. (Jordan Owens, #1073)
+* Prevent unexpected call stack jumps from causing an obscure error (`IndexError`), and
+ replace that error with a proper informative message. (Jon Rowe, #1076)
+
+### 3.8.1 / 2018-08-06
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.8.0...v3.8…
+
+Bug Fixes:
+
+* Fix regression in `include` matcher so stopped
+ `expect(hash.with_indifferent_access).to include(:symbol_key)`
+ from working. (Eito Katagiri, #1069)
+
+### 3.8.0 / 2018-08-04
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.7.0...v3.8…
+
+Enhancements:
+
+* Improve failure message of `change(receiver, :message)` by including the
+ receiver as `SomeClass#some_message`. (Tomohiro Hashidate, #1005)
+* Improve `change` matcher so that it can correctly detect changes in
+ deeply nested mutable objects (such as arrays-of-hashes-of-arrays).
+ The improved logic uses the before/after `hash` value to see if the
+ object has been mutated, rather than shallow duping the object.
+ (Myron Marston, #1034)
+* Improve `include` matcher so that pseudo-hash objects (e.g. objects
+ that decorate a hash using a `SimpleDelegator` or similar) are treated
+ as a hash, as long as they implement `to_hash`. (Pablo Brasero, #1012)
+* Add `max_formatted_output_length=` to configuration, allowing changing
+ the length at which we truncate large output strings.
+ (Sam Phippen #951, Benoit Tigeot #1056)
+* Improve error message when passing a matcher that doesn't support block
+ expectations to a block based `expect`. (@nicktime, #1066)
### 3.7.0 / 2017-10-17
[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.6.0...v3.7…
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2017-10-17 17:13:31.000000000 +0200
+++ new/README.md 2018-10-09 22:43:31.000000000 +0200
@@ -20,7 +20,7 @@
```ruby
%w[rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
- gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => 'master'
+ gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
end
```
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
Binary files old/checksums.yaml.gz.sig and new/checksums.yaml.gz.sig differ
Binary files old/data.tar.gz.sig and new/data.tar.gz.sig differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/expectations/block_snippet_extractor.rb new/lib/rspec/expectations/block_snippet_extractor.rb
--- old/lib/rspec/expectations/block_snippet_extractor.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/expectations/block_snippet_extractor.rb 2018-10-09 22:43:31.000000000 +0200
@@ -1,7 +1,7 @@
module RSpec
module Expectations
# @private
- class BlockSnippetExtractor # rubocop:disable Style/ClassLength
+ class BlockSnippetExtractor # rubocop:disable Metrics/ClassLength
# rubocop should properly handle `Struct.new {}` as an inner class definition.
attr_reader :proc, :method_name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/expectations/configuration.rb new/lib/rspec/expectations/configuration.rb
--- old/lib/rspec/expectations/configuration.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/expectations/configuration.rb 2018-10-09 22:43:31.000000000 +0200
@@ -56,6 +56,20 @@
end
end
+ # Configures the maximum character length that RSpec will print while
+ # formatting an object. You can set length to nil to prevent RSpec from
+ # doing truncation.
+ # @param [Fixnum] length the number of characters to limit the formatted output to.
+ # @example
+ # RSpec.configure do |rspec|
+ # rspec.expect_with :rspec do |c|
+ # c.max_formatted_output_length = 200
+ # end
+ # end
+ def max_formatted_output_length=(length)
+ RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = length
+ end
+
# The list of configured syntaxes.
# @return [Array<Symbol>] the list of configured syntaxes.
# @example
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/expectations/expectation_target.rb new/lib/rspec/expectations/expectation_target.rb
--- old/lib/rspec/expectations/expectation_target.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/expectations/expectation_target.rb 2018-10-09 22:43:31.000000000 +0200
@@ -112,7 +112,7 @@
def enforce_block_expectation(matcher)
return if supports_block_expectations?(matcher)
- raise ExpectationNotMetError, "You must pass an argument rather than a block to use the provided " \
+ raise ExpectationNotMetError, "You must pass an argument rather than a block to `expect` to use the provided " \
"matcher (#{RSpec::Support::ObjectFormatter.format(matcher)}), or the matcher must implement " \
"`supports_block_expectations?`."
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/expectations/minitest_integration.rb new/lib/rspec/expectations/minitest_integration.rb
--- old/lib/rspec/expectations/minitest_integration.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/expectations/minitest_integration.rb 2018-10-09 22:43:31.000000000 +0200
@@ -53,6 +53,6 @@
module Expectations
remove_const :ExpectationNotMetError
# Exception raised when an expectation fails.
- ExpectationNotMetError = ::Minitest::Assertion
+ const_set :ExpectationNotMetError, ::Minitest::Assertion
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/expectations/syntax.rb new/lib/rspec/expectations/syntax.rb
--- old/lib/rspec/expectations/syntax.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/expectations/syntax.rb 2018-10-09 22:43:31.000000000 +0200
@@ -106,7 +106,7 @@
# that this syntax does not always play nice with delegate/proxy objects.
# We recommend you use the non-monkeypatching `:expect` syntax instead.
class BasicObject
- # @method should
+ # @method should(matcher, message)
# Passes if `matcher` returns true. Available on every `Object`.
# @example
# actual.should eq expected
@@ -118,7 +118,7 @@
# @note This is only available when you have enabled the `:should` syntax.
# @see RSpec::Matchers
- # @method should_not
+ # @method should_not(matcher, message)
# Passes if `matcher` returns false. Available on every `Object`.
# @example
# actual.should_not eq expected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/expectations/version.rb new/lib/rspec/expectations/version.rb
--- old/lib/rspec/expectations/version.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/expectations/version.rb 2018-10-09 22:43:31.000000000 +0200
@@ -2,7 +2,7 @@
module Expectations
# @private
module Version
- STRING = '3.7.0'
+ STRING = '3.8.2'
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/built_in/change.rb new/lib/rspec/matchers/built_in/change.rb
--- old/lib/rspec/matchers/built_in/change.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/built_in/change.rb 2018-10-09 22:43:31.000000000 +0200
@@ -43,16 +43,13 @@
# @private
def matches?(event_proc)
- @event_proc = event_proc
- return false unless Proc === event_proc
raise_block_syntax_error if block_given?
- change_details.perform_change(event_proc)
- change_details.changed?
+ perform_change(event_proc) && change_details.changed?
end
def does_not_match?(event_proc)
raise_block_syntax_error if block_given?
- !matches?(event_proc) && Proc === event_proc
+ perform_change(event_proc) && !change_details.changed?
end
# @api private
@@ -92,6 +89,18 @@
@change_details ||= ChangeDetails.new(matcher_name, @receiver, @message, &@block)
end
+ def perform_change(event_proc)
+ @event_proc = event_proc
+ change_details.perform_change(event_proc) do |actual_before|
+ # pre-compute values derived from the `before` value before the
+ # mutation is applied, in case the specified mutation is mutation
+ # of a single object (rather than a changing what object a method
+ # returns). We need to cache these values before the `before` value
+ # they are based on potentially gets mutated.
+ @actual_before_description = description_of(actual_before)
+ end
+ end
+
def raise_block_syntax_error
raise SyntaxError, "Block not received by the `change` matcher. " \
"Perhaps you want to use `{ ... }` instead of do/end?"
@@ -99,12 +108,12 @@
def positive_failure_reason
return "was not given a block" unless Proc === @event_proc
- "is still #{description_of change_details.actual_before}"
+ "is still #{@actual_before_description}"
end
def negative_failure_reason
return "was not given a block" unless Proc === @event_proc
- "did change from #{description_of change_details.actual_before} " \
+ "did change from #{@actual_before_description} " \
"to #{description_of change_details.actual_after}"
end
end
@@ -129,9 +138,7 @@
# @private
def matches?(event_proc)
@event_proc = event_proc
- return false unless Proc === event_proc
- @change_details.perform_change(event_proc)
- @comparer.call(@change_details.actual_delta)
+ @change_details.perform_change(event_proc) && @comparer.call(@change_details.actual_delta)
end
# @private
@@ -173,10 +180,7 @@
# @private
def matches?(event_proc)
- @event_proc = event_proc
- return false unless Proc === event_proc
- @change_details.perform_change(event_proc)
- @change_details.changed? && matches_before? && matches_after?
+ perform_change(event_proc) && @change_details.changed? && @matches_before && matches_after?
end
# @private
@@ -187,7 +191,7 @@
# @private
def failure_message
return not_given_a_block_failure unless Proc === @event_proc
- return before_value_failure unless matches_before?
+ return before_value_failure unless @matches_before
return did_not_change_failure unless @change_details.changed?
after_value_failure
end
@@ -199,8 +203,17 @@
private
- def matches_before?
- values_match?(@expected_before, @change_details.actual_before)
+ def perform_change(event_proc)
+ @event_proc = event_proc
+ @change_details.perform_change(event_proc) do |actual_before|
+ # pre-compute values derived from the `before` value before the
+ # mutation is applied, in case the specified mutation is mutation
+ # of a single object (rather than a changing what object a method
+ # returns). We need to cache these values before the `before` value
+ # they are based on potentially gets mutated.
+ @matches_before = values_match?(@expected_before, actual_before)
+ @actual_before_description = description_of(actual_before)
+ end
end
def matches_after?
@@ -210,7 +223,7 @@
def before_value_failure
"expected #{(a)change_details.value_representation} " \
"to have initially been #{description_of @expected_before}, " \
- "but was #{description_of @change_details.actual_before}"
+ "but was #{@actual_before_description}"
end
def after_value_failure
@@ -226,7 +239,7 @@
def did_change_failure
"expected #{(a)change_details.value_representation} not to have changed, but " \
- "did change from #{description_of @change_details.actual_before} " \
+ "did change from #{@actual_before_description} " \
"to #{description_of @change_details.actual_after}"
end
@@ -260,16 +273,13 @@
"is not supported"
end
- @event_proc = event_proc
- return false unless Proc === event_proc
- @change_details.perform_change(event_proc)
- !(a)change_details.changed? && matches_before?
+ perform_change(event_proc) && !(a)change_details.changed? && @matches_before
end
# @private
def failure_message_when_negated
return not_given_a_block_failure unless Proc === @event_proc
- return before_value_failure unless matches_before?
+ return before_value_failure unless @matches_before
did_change_failure
end
@@ -312,8 +322,20 @@
# @private
# Encapsulates the details of the before/after values.
+ #
+ # Note that this class exposes the `actual_after` value, to allow the
+ # matchers above to derive failure messages, etc from the value on demand
+ # as needed, but it intentionally does _not_ expose the `actual_before`
+ # value. Some usages of the `change` matcher mutate a specific object
+ # returned by the value proc, which means that failure message snippets,
+ # etc, which are derived from the `before` value may not be accurate if
+ # they are lazily computed as needed. We must pre-compute them before
+ # applying the change in the `expect` block. To ensure that all `change`
+ # matchers do that properly, we do not expose the `actual_before` value.
+ # Instead, matchers must pass a block to `perform_change`, which yields
+ # the `actual_before` value before applying the change.
class ChangeDetails
- attr_reader :actual_before, :actual_after
+ attr_reader :actual_after
def initialize(matcher_name, receiver=nil, message=nil, &block)
if receiver && !message
@@ -334,7 +356,7 @@
def value_representation
@value_representation ||=
if @message
- "##{@message}"
+ "`#{message_notation(@receiver, @message)}`"
elsif (value_block_snippet = extract_value_block_snippet)
"`#{value_block_snippet}`"
else
@@ -344,12 +366,29 @@
def perform_change(event_proc)
@actual_before = evaluate_value_proc
+ @before_hash = @actual_before.hash
+ yield @actual_before if block_given?
+
+ return false unless Proc === event_proc
event_proc.call
+
@actual_after = evaluate_value_proc
+ true
end
def changed?
- @actual_before != @actual_after
+ # Consider it changed if either:
+ #
+ # - The before/after values are unequal
+ # - The before/after values have different hash values
+ #
+ # The latter case specifically handles the case when the value proc
+ # returns the exact same object, but it has been mutated.
+ #
+ # Note that it is not sufficient to only check the hashes; it is
+ # possible for two values to be unequal (and of different classes)
+ # but to return the same hash value.
+ @actual_before != @actual_after || @before_hash != @actual_after.hash
end
def actual_delta
@@ -359,15 +398,15 @@
private
def evaluate_value_proc
- value_proc = @value_proc || lambda { @receiver.__send__(@message) }
+ @value_proc ? @value_proc.call : @receiver.__send__(@message)
+ end
- case val = value_proc.call
- when IO # enumerable, but we don't want to dup it.
- val
- when Enumerable, String
- val.dup
+ def message_notation(receiver, message)
+ case receiver
+ when Module
+ "#{receiver}.#{message}"
else
- val
+ "#{Support.class_of(receiver)}##{message}"
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/built_in/compound.rb new/lib/rspec/matchers/built_in/compound.rb
--- old/lib/rspec/matchers/built_in/compound.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/built_in/compound.rb 2018-10-09 22:43:31.000000000 +0200
@@ -3,7 +3,6 @@
module BuiltIn
# @api private
# Base class for `and` and `or` compound matchers.
- # rubocop:disable ClassLength
class Compound < BaseMatcher
# @private
attr_reader :matcher_1, :matcher_2, :evaluator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/built_in/contain_exactly.rb new/lib/rspec/matchers/built_in/contain_exactly.rb
--- old/lib/rspec/matchers/built_in/contain_exactly.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/built_in/contain_exactly.rb 2018-10-09 22:43:31.000000000 +0200
@@ -89,7 +89,7 @@
elsif actual.respond_to?(:to_a) && !to_a_disallowed?(actual)
@actual = actual.to_a
else
- return false
+ false
end
end
@@ -176,6 +176,7 @@
#
# @private
class PairingsMaximizer
+ # @private
Solution = Struct.new(:unmatched_expected_indexes, :unmatched_actual_indexes,
:indeterminate_expected_indexes, :indeterminate_actual_indexes) do
def worse_than?(other)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/built_in/has.rb new/lib/rspec/matchers/built_in/has.rb
--- old/lib/rspec/matchers/built_in/has.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/built_in/has.rb 2018-10-09 22:43:31.000000000 +0200
@@ -77,7 +77,7 @@
end
def method_description
- @method_name.to_s.gsub('_', ' ')
+ @method_name.to_s.tr('_', ' ')
end
def args_description
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/built_in/include.rb new/lib/rspec/matchers/built_in/include.rb
--- old/lib/rspec/matchers/built_in/include.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/built_in/include.rb 2018-10-09 22:43:31.000000000 +0200
@@ -15,12 +15,14 @@
# @api private
# @return [Boolean]
def matches?(actual)
+ actual = actual.to_hash if convert_to_hash?(actual)
perform_match(actual) { |v| v }
end
# @api private
# @return [Boolean]
def does_not_match?(actual)
+ actual = actual.to_hash if convert_to_hash?(actual)
perform_match(actual) { |v| !v }
end
@@ -137,6 +139,10 @@
actual.include?(str) && lines.none? { |line| line == str }
end
end
+
+ def convert_to_hash?(obj)
+ !obj.respond_to?(:include?) && obj.respond_to?(:to_hash)
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/built_in/respond_to.rb new/lib/rspec/matchers/built_in/respond_to.rb
--- old/lib/rspec/matchers/built_in/respond_to.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/built_in/respond_to.rb 2018-10-09 22:43:31.000000000 +0200
@@ -151,7 +151,7 @@
@expected_keywords.map(&:inspect).join(' and ')
else
"#{@expected_keywords[0...-1].map(&:inspect).join(', ')}, and #{(a)expected_keywords.last.inspect}"
- end
+ end
"keyword#{(a)expected_keywords.count == 1 ? '' : 's'} #{kw_str}"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/built_in/satisfy.rb new/lib/rspec/matchers/built_in/satisfy.rb
--- old/lib/rspec/matchers/built_in/satisfy.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/built_in/satisfy.rb 2018-10-09 22:43:31.000000000 +0200
@@ -34,7 +34,7 @@
"expected #{actual_formatted} not to #{description}"
end
- private # rubocop:disable Lint/UselessAccessModifier
+ private
if RSpec::Support::RubyFeatures.ripper_supported?
def block_representation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/composable.rb new/lib/rspec/matchers/composable.rb
--- old/lib/rspec/matchers/composable.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/composable.rb 2018-10-09 22:43:31.000000000 +0200
@@ -156,10 +156,12 @@
# Wraps an item in order to surface its `description` via `inspect`.
# @api private
DescribableItem = Struct.new(:item) do
+ # Inspectable version of the item description
def inspect
"(#{item.description})"
end
+ # A pretty printed version of the item description.
def pretty_print(pp)
pp.text "(#{item.description})"
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/english_phrasing.rb new/lib/rspec/matchers/english_phrasing.rb
--- old/lib/rspec/matchers/english_phrasing.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/english_phrasing.rb 2018-10-09 22:43:31.000000000 +0200
@@ -44,14 +44,14 @@
# So it appears that `Array` can trigger that (e.g. by calling `to_a` on the passed object?)
# So here we replace `Kernel#Array` with our own warning-free implementation for 1.8.7.
# @private
- # rubocop:disable Style/MethodName
+ # rubocop:disable Naming/MethodName
def self.Array(obj)
case obj
when Array then obj
else [obj]
end
end
- # rubocop:enable Style/MethodName
+ # rubocop:enable Naming/MethodName
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers/generated_descriptions.rb new/lib/rspec/matchers/generated_descriptions.rb
--- old/lib/rspec/matchers/generated_descriptions.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers/generated_descriptions.rb 2018-10-09 22:43:31.000000000 +0200
@@ -21,8 +21,7 @@
"#{last_expectation_handler.verb} #{last_description}"
end
- private
-
+ # @private
def self.last_description
last_matcher.respond_to?(:description) ? last_matcher.description : <<-MESSAGE
When you call a matcher in an example without a String, like this:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rspec/matchers.rb new/lib/rspec/matchers.rb
--- old/lib/rspec/matchers.rb 2017-10-17 17:13:31.000000000 +0200
+++ new/lib/rspec/matchers.rb 2018-10-09 22:43:31.000000000 +0200
@@ -480,7 +480,10 @@
# == Notes
#
# Evaluates `receiver.message` or `block` before and after it
- # evaluates the block passed to `expect`.
+ # evaluates the block passed to `expect`. If the value is the same
+ # object, its before/after `hash` value is used to see if it has changed.
+ # Therefore, your object needs to properly implement `hash` to work correctly
+ # with this matcher.
#
# `expect( ... ).not_to change` supports the form that specifies `from`
# (which specifies what you expect the starting, unchanged value to be)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-10-17 17:13:31.000000000 +0200
+++ new/metadata 2018-10-09 22:43:31.000000000 +0200
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: rspec-expectations
version: !ruby/object:Gem::Version
- version: 3.7.0
+ version: 3.8.2
platform: ruby
authors:
- Steven Baker
@@ -45,7 +45,7 @@
ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
F3MdtaDehhjC
-----END CERTIFICATE-----
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rspec-support
@@ -53,14 +53,14 @@
requirements:
- - "~>"
- !ruby/object:Gem::Version
- version: 3.7.0
+ version: 3.8.0
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - "~>"
- !ruby/object:Gem::Version
- version: 3.7.0
+ version: 3.8.0
- !ruby/object:Gem::Dependency
name: diff-lcs
requirement: !ruby/object:Gem::Requirement
@@ -218,9 +218,8 @@
version: '0'
requirements: []
rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
signing_key:
specification_version: 4
-summary: rspec-expectations-3.7.0
+summary: rspec-expectations-3.8.2
test_files: []
-has_rdoc:
Binary files old/metadata.gz.sig and new/metadata.gz.sig differ
1
0
Hello community,
here is the log from the commit of package yast2-storage-ng for openSUSE:Factory checked in at 2018-11-01 19:09:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage-ng (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage-ng.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage-ng"
Thu Nov 1 19:09:58 2018 rev:30 rq:645752 version:4.1.29
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng.changes 2018-09-04 22:52:03.672157238 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-storage-ng.new/yast2-storage-ng.changes 2018-11-01 19:10:00.622034579 +0100
@@ -1,0 +2,158 @@
+Wed Oct 31 13:34:48 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Format the new multi-line compound actions correctly (bsc#1085134)
+- 4.1.29
+
+-------------------------------------------------------------------
+Tue Oct 30 13:38:10 UTC 2018 - snwint(a)suse.com
+
+- do not include 'Partition' in partition type names
+
+-------------------------------------------------------------------
+Fri Oct 26 11:37:48 UTC 2018 - snwint(a)suse.com
+
+- allow creation of partitions starting before 1 MiB in expert
+ partitioner
+
+-------------------------------------------------------------------
+Sat Oct 20 22:10:48 WEST 2018 - igonzalezsosa(a)suse.com
+
+- Fixes and improvements to AutoYaST partitioning:
+ - Improve support to reuse a disk as a PV (bsc#1107298).
+ - Resize and then create new devices (bsc#1112545).
+ - Warn the user when trying to reuse a non-existent filesystem.
+ - Fix support of old format to specify several software RAIDs
+ (bsc#1112546).
+ - Proper support for Xen virtual partitions (bsc#1105350).
+ - Export enable_snapshots element properly (related to
+ bsc#1073544).
+ - Allow to format a whole disk and use it as a filesystem.
+ - Add support for partitioned software RAIDs (fate#326573).
+ - Allow to use a whole disk as a software RAID member (related
+ to fate#326573).
+- 4.1.28
+
+-------------------------------------------------------------------
+Fri Oct 19 11:59:10 UTC 2018 - jreidinger(a)suse.com
+
+- Add support for selecting cache mode during bcache creation
+ (fate#325346)
+- 4.1.27
+
+-------------------------------------------------------------------
+Thu Oct 18 14:04:59 UTC 2018 - ancor(a)suse.com
+
+- Improved UI responsiveness by caching the value of some internal
+ methods (bsc#1112402):
+ * StorageClassWrapper.downcasted_new
+ * StorageEnv#active?
+ * DiskDevice#types_for_is
+- Improved compatibility with RSpec 3.8 by caching the objects
+ used to wrap libstorage-ng enum values.
+- 4.1.26
+
+-------------------------------------------------------------------
+Tue Oct 16 12:58:10 UTC 2018 - jreidinger(a)suse.com
+
+- Improve filtering of possible backing devices for bcache and
+ limit deletion of bcache to only safe cases (fate#325346)
+- 4.1.25
+
+-------------------------------------------------------------------
+Thu Oct 11 15:03:26 UTC 2018 - ancor(a)suse.com
+
+- Improved the warning messages about missing BIOS Boot partition,
+ both in the Partitioner and in AutoYaST (bsc#1087275).
+- Improved other AutoYaST warning messages related to the
+ partitions needed for booting.
+- 4.1.24
+
+-------------------------------------------------------------------
+Fri Oct 5 09:43:38 UTC 2018 - jreidinger(a)suse.com
+
+- Implement creating and deleting bcache devices (fate#325346)
+- 4.1.23
+
+-------------------------------------------------------------------
+Tue Oct 2 13:44:40 UTC 2018 - schubi(a)suse.de
+
+- Fixed flickering testcase. Maybe produced by the fix of
+ bsc#1108831.
+- 4.1.22
+
+-------------------------------------------------------------------
+Tue Oct 2 13:43:16 UTC 2018 - ancor(a)suse.com
+
+- Partitioner: make it possible to directly format a disk (with
+ no partitions).
+- Partitioner: reorganized the user interface by grouping options
+ to ensure all the new possibilities (like formatting a whole
+ disk or creating partitions on an MD RAID) fit into text mode
+ 80x24 (part of fate#318196 and of fate#326573).
+- 4.1.21
+
+-------------------------------------------------------------------
+Thu Sep 27 15:13:31 CEST 2018 - schubi(a)suse.de
+
+- AutoYaST proposal: Do not crash if existing boot partition
+ cannot be used without formatting it. (bsc#1108831)
+- 4.1.20
+
+-------------------------------------------------------------------
+Fri Sep 20 13:19:58 UTC 2018 - jlopez(a)suse.com
+
+- Partitioner: ask for unmounting when deleting a device.
+- Partitioner: ask for unmounting when resizing a device.
+- Part of fate#318196
+- 4.1.19
+
+-------------------------------------------------------------------
+Tue Sep 20 13:00:29 UTC 2018 - jlopez(a)suse.com
+
+- AutoYaST: Allow to use whole disk as PV by indicating a partition
+ with number 0 (bsc#1107298).
+
+-------------------------------------------------------------------
+Wed Sep 19 21:23:54 UTC 2018 - lorenz(a)math.tu-berlin.de
+
+- When trying to reuse a partition, AutoYaST will consider only
+ those partitions from the right disk (bsc#1106774).
+
+-------------------------------------------------------------------
+Wed Sep 19 14:28:22 UTC 2018 - dgonzalez(a)suse.com
+
+- Do not crash when a partition content info cannot be
+ detected (bsc#1101979).
+- 4.1.18
+
+-------------------------------------------------------------------
+Wed Sep 19 11:43:13 UTC 2018 - jreidinger(a)suse.com
+
+- Add read-only support for Bcache (fate#325346)
+- 4.1.17
+
+-------------------------------------------------------------------
+Wed Sep 19 11:25:25 UTC 2018 - ancor(a)suse.com
+
+- Partitioner: allow to manage partitions in software MD RAIDs
+ (fate#318196, bsc#1094933 and bsc#1092417).
+- 4.1.16
+
+-------------------------------------------------------------------
+Fri Sep 7 15:24:41 UTC 2018 - ancor(a)suse.com
+
+- Partitioner: do not offer partitions of other RAIDs as available
+ devices to create MD RAID arrays (fate#318196).
+- 4.1.15
+
+-------------------------------------------------------------------
+Wed Sep 5 14:41:15 UTC 2018 - ancor(a)suse.com
+
+- Partitioner: allow to add full disks and multipath devices (with
+ no partition table) to MD RAID arrays (fate#318196).
+- Partitioner: improved checks and workflow for "Create New
+ Partition Table"
+- More informative message when a device is in use.
+- 4.1.14
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-ng-4.1.13.tar.bz2
New:
----
yast2-storage-ng-4.1.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage-ng.spec ++++++
--- /var/tmp/diff_new_pack.W7xtlz/_old 2018-11-01 19:10:01.306034613 +0100
+++ /var/tmp/diff_new_pack.W7xtlz/_new 2018-11-01 19:10:01.306034613 +0100
@@ -17,18 +17,18 @@
Name: yast2-storage-ng
-Version: 4.1.13
+Version: 4.1.29
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
-# CWM::Dialog#abort_handler
-Requires: yast2 >= 4.0.73
+# CWM::Dialog#next_handler (4.1 branch) and improved CWM::Dialog
+Requires: yast2 >= 4.1.11
# for AbortException and handle direct abort
Requires: yast2-ruby-bindings >= 4.0.6
-# Storage::StrayBlkDevice (in the SLE15-SP1 branch)
-Requires: libstorage-ng-ruby >= 4.1.5
+# Storage::Bcache#cache_mode
+Requires: libstorage-ng-ruby >= 4.1.45
# communicate with udisks
Requires: rubygem(ruby-dbus)
# Y2Packager::Repository
@@ -37,15 +37,15 @@
Requires: findutils
BuildRequires: update-desktop-files
-# Storage::StrayBlkDevice (in the SLE15-SP1 branch)
-BuildRequires: libstorage-ng-ruby >= 4.1.5
+# Storage::Bcache#cache_mode
+BuildRequires: libstorage-ng-ruby >= 4.1.45
BuildRequires: yast2-devtools
BuildRequires: yast2-ruby-bindings
# yast2-xml dependency is added by yast2 but ignored in the
# openSUSE:Factory project config
BuildRequires: yast2-xml
-# CWM::Dialog#abort_handler
-BuildRequires: yast2 >= 4.0.73
+# CWM::Dialog#next_handler (4.1 branch) and improved CWM::Dialog
+BuildRequires: yast2 >= 4.1.11
# for AbortException and handle direct abort
BuildRequires: yast2-ruby-bindings >= 4.0.6
BuildRequires: rubygem(rspec)
@@ -61,7 +61,7 @@
Obsoletes: yast2-storage
Summary: YaST2 - Storage Configuration
-License: GPL-2.0-only or GPL-3.0-only
+License: GPL-2.0-only OR GPL-3.0-only
Group: System/YaST
%description
++++++ yast2-storage-ng-4.1.13.tar.bz2 -> yast2-storage-ng-4.1.29.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng-4.1.13.tar.bz2 /work/SRC/openSUSE:Factory/.yast2-storage-ng.new/yast2-storage-ng-4.1.29.tar.bz2 differ: char 11, line 1
1
0
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2018-11-01 19:09:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Thu Nov 1 19:09:24 2018 rev:393 rq:645685 version:4.1.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2018-09-04 22:50:51.463909529 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2018-11-01 19:09:26.250032826 +0100
@@ -1,0 +2,72 @@
+Wed Oct 31 08:37:13 UTC 2018 - mfilka(a)suse.com
+
+- bnc#1111925
+ - always propose wpa_supplicant when configuring wlan
+- bsc#1113080
+ - Fix detection of peap mode (jreidinger(a)suse.com)
+- Propose most commonly used setup for WPA by default
+- 4.1.15
+
+-------------------------------------------------------------------
+Wed Oct 24 13:12:33 UTC 2018 - jreidinger(a)suse.com
+
+- Fix detection of peap mode (bsc#1113080)
+- 4.1.14
+
+-------------------------------------------------------------------
+Tue Oct 16 19:29:30 UTC 2018 - knut.anderssen(a)suse.com
+
+- Simplified the installation network proposal collecting all the
+ configured dhcp interfaces in a single entry (fate#326480)
+- 4.1.13
+
+-------------------------------------------------------------------
+Tue Oct 16 09:02:26 UTC 2018 - mfilka(a)suse.com
+
+- bsc#1110598
+ - fixed path to license file
+- 4.1.12
+
+-------------------------------------------------------------------
+Mon Oct 15 08:38:58 UTC 2018 - mfilka(a)suse.com
+
+- fate#323454
+ - wicked compatible parsing of NTP servers from dhcp leases
+- 4.1.11
+
+-------------------------------------------------------------------
+Thu Oct 4 21:46:23 UTC 2018 - knut.anderssen(a)suse.com
+
+- Fixes to the networking AY schema (bsc#1108852)
+ - Added missed s390 device 'layer2' boolean element.
+- 4.1.10
+
+-------------------------------------------------------------------
+Wed Oct 3 07:33:01 UTC 2018 - mfilka(a)suse.com
+
+- bnc#1105230
+ - do not crash with internal error when 0.0.0.0 netmask is used
+ in the routing tab
+- Activate s390 network devices before applying udev naming rules,
+ avoiding "Invalid key/value pair in
+ /etc/udev/rules.d/70-persistent-net.rules" (bsc#1095761)
+ (by mvidner(a)suse.com)
+- 4.1.9
+
+-------------------------------------------------------------------
+Tue Oct 2 19:59:14 UTC 2018 - mfilka(a)suse.com
+
+- bnc#1109312
+ - fixed internal error (replaced calls to LanItems::FreeDevices
+ which was removed)
+- 4.1.8
+
+-------------------------------------------------------------------
+Tue Sep 18 07:31:10 UTC 2018 - mfilka(a)suse.com
+
+- bnc#964856
+ - adapted to changes in NetworkInterfaces API
+ - GetFreeDevice and GetFreeDevices was dropped
+- 4.1.7
+
+-------------------------------------------------------------------
Old:
----
yast2-network-4.1.6.tar.bz2
New:
----
yast2-network-4.1.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.Xbp1zh/_old 2018-11-01 19:09:26.742032852 +0100
+++ /var/tmp/diff_new_pack.Xbp1zh/_new 2018-11-01 19:09:26.746032852 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.1.6
+Version: 4.1.15
Release: 0
BuildArch: noarch
@@ -107,7 +107,7 @@
%dir %{yast_docdir}
%doc %{yast_docdir}/CONTRIBUTING.md
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%changelog
++++++ yast2-network-4.1.6.tar.bz2 -> yast2-network-4.1.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/doc/Makefile.am new/yast2-network-4.1.15/doc/Makefile.am
--- old/yast2-network-4.1.6/doc/Makefile.am 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#
-# Makefile.am for y2c_network/doc
-#
-
-SUBDIRS = autodocs
-
-htmldir = $(docdir)
-
-doc_DATA = autoinst
-html_DATA = devices.html
-
-EXTRA_DIST = $(doc_DATA) $(html_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/package/yast2-network.changes new/yast2-network-4.1.15/package/yast2-network.changes
--- old/yast2-network-4.1.6/package/yast2-network.changes 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/package/yast2-network.changes 2018-10-31 10:03:07.000000000 +0100
@@ -1,4 +1,76 @@
-------------------------------------------------------------------
+Wed Oct 31 08:37:13 UTC 2018 - mfilka(a)suse.com
+
+- bnc#1111925
+ - always propose wpa_supplicant when configuring wlan
+- bsc#1113080
+ - Fix detection of peap mode (jreidinger(a)suse.com)
+- Propose most commonly used setup for WPA by default
+- 4.1.15
+
+-------------------------------------------------------------------
+Wed Oct 24 13:12:33 UTC 2018 - jreidinger(a)suse.com
+
+- Fix detection of peap mode (bsc#1113080)
+- 4.1.14
+
+-------------------------------------------------------------------
+Tue Oct 16 19:29:30 UTC 2018 - knut.anderssen(a)suse.com
+
+- Simplified the installation network proposal collecting all the
+ configured dhcp interfaces in a single entry (fate#326480)
+- 4.1.13
+
+-------------------------------------------------------------------
+Tue Oct 16 09:02:26 UTC 2018 - mfilka(a)suse.com
+
+- bsc#1110598
+ - fixed path to license file
+- 4.1.12
+
+-------------------------------------------------------------------
+Mon Oct 15 08:38:58 UTC 2018 - mfilka(a)suse.com
+
+- fate#323454
+ - wicked compatible parsing of NTP servers from dhcp leases
+- 4.1.11
+
+-------------------------------------------------------------------
+Thu Oct 4 21:46:23 UTC 2018 - knut.anderssen(a)suse.com
+
+- Fixes to the networking AY schema (bsc#1108852)
+ - Added missed s390 device 'layer2' boolean element.
+- 4.1.10
+
+-------------------------------------------------------------------
+Wed Oct 3 07:33:01 UTC 2018 - mfilka(a)suse.com
+
+- bnc#1105230
+ - do not crash with internal error when 0.0.0.0 netmask is used
+ in the routing tab
+- Activate s390 network devices before applying udev naming rules,
+ avoiding "Invalid key/value pair in
+ /etc/udev/rules.d/70-persistent-net.rules" (bsc#1095761)
+ (by mvidner(a)suse.com)
+- 4.1.9
+
+-------------------------------------------------------------------
+Tue Oct 2 19:59:14 UTC 2018 - mfilka(a)suse.com
+
+- bnc#1109312
+ - fixed internal error (replaced calls to LanItems::FreeDevices
+ which was removed)
+- 4.1.8
+
+-------------------------------------------------------------------
+Tue Sep 18 07:31:10 UTC 2018 - mfilka(a)suse.com
+
+- bnc#964856
+ - adapted to changes in NetworkInterfaces API
+ - GetFreeDevice and GetFreeDevices was dropped
+- 4.1.7
+
+-------------------------------------------------------------------
Wed Aug 22 07:19:45 UTC 2018 - dgonzalez(a)suse.com
- Update calls to YaST2 systemd classes (related to fate#319428)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/package/yast2-network.spec new/yast2-network-4.1.15/package/yast2-network.spec
--- old/yast2-network-4.1.6/package/yast2-network.spec 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/package/yast2-network.spec 2018-10-31 10:03:07.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.1.6
+Version: 4.1.15
Release: 0
BuildArch: noarch
@@ -107,7 +107,7 @@
%dir %{yast_docdir}
%doc %{yast_docdir}/CONTRIBUTING.md
-%license %{yast_docdir}/COPYING
+%license COPYING
%doc %{yast_docdir}/README.md
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/autoyast-rnc/networking.rnc new/yast2-network-4.1.15/src/autoyast-rnc/networking.rnc
--- old/yast2-network-4.1.6/src/autoyast-rnc/networking.rnc 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/autoyast-rnc/networking.rnc 2018-10-31 10:03:07.000000000 +0100
@@ -98,6 +98,7 @@
device =
element (device | listentry) {
element type { text }? &
+ element layer2 { BOOLEAN}? &
element chanids { text }? &
element portname { text }? &
element protocol { text }? &
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/clients/host_auto.rb new/yast2-network-4.1.15/src/clients/host_auto.rb
--- old/yast2-network-4.1.6/src/clients/host_auto.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/clients/host_auto.rb 2018-10-31 10:03:07.000000000 +0100
@@ -145,7 +145,7 @@
# Semantic AutoYaST profile check
#
# Problems will be stored in AutoInstall.issues_list.
- # @param [Hash] input autoyast settings
+ # @param imported_hosts [Hash] autoyast settings
def check_profile_for_errors(imported_hosts)
# Checking for empty hostnames
imported_hosts.each do |ip, hosts|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/clients/lan_auto.rb new/yast2-network-4.1.15/src/clients/lan_auto.rb
--- old/yast2-network-4.1.6/src/clients/lan_auto.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/clients/lan_auto.rb 2018-10-31 10:03:07.000000000 +0100
@@ -59,7 +59,7 @@
Builtins.y2milestone("Lan autoinst callback: #{@func}")
if @func == "Summary"
- @ret = Ops.get_string(Lan.Summary("summary"), 0, "")
+ @ret = Lan.Summary("summary")
elsif @func == "Reset"
Lan.Import({})
@ret = {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/data/network/sysconfig_defaults.yml new/yast2-network-4.1.15/src/data/network/sysconfig_defaults.yml
--- old/yast2-network-4.1.6/src/data/network/sysconfig_defaults.yml 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/data/network/sysconfig_defaults.yml 2018-10-31 10:03:07.000000000 +0100
@@ -27,7 +27,7 @@
WIRELESS_BITRATE: auto
WIRELESS_AP: ''
WIRELESS_POWER: ''
-WIRELESS_EAP_MODE: ''
+WIRELESS_EAP_MODE: 'PEAP'
WIRELESS_WPA_IDENTITY: ''
WIRELESS_WPA_PASSWORD: ''
WIRELESS_WPA_ANONID: ''
@@ -35,7 +35,7 @@
WIRELESS_CLIENT_KEY: ''
WIRELESS_CLIENT_KEY_PASSWORD: ''
WIRELESS_CA_CERT: ''
-WIRELESS_EAP_AUTH: ''
+WIRELESS_EAP_AUTH: 'MSCHAPV2'
WIRELESS_PEAP_VERSION: ''
WIRELESS_AP_SCANMODE: '1'
BONDING_MODULE_OPTS: mode=active-backup miimon=100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/include/network/lan/hardware.rb new/yast2-network-4.1.15/src/include/network/lan/hardware.rb
--- old/yast2-network-4.1.6/src/include/network/lan/hardware.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/include/network/lan/hardware.rb 2018-10-31 10:03:07.000000000 +0100
@@ -33,6 +33,9 @@
module Yast
module NetworkLanHardwareInclude
+ # how many device names is proposed in Hardware dialog
+ NEW_DEVICES_COUNT = 10
+
def initialize_network_lan_hardware(include_target)
Yast.import "UI"
@@ -240,24 +243,8 @@
Builtins.y2milestone("hotplug=%1", LanItems.hotplug)
- Ops.set(
- @hardware,
- "devices",
- LanItems.FreeDevices(Ops.get_string(@hardware, "realtype", ""))
- ) # TODO: id-, bus-, ... here
- if !Builtins.contains(
- Ops.get_list(@hardware, "devices", []),
- Ops.get_string(@hardware, "device", "")
- )
- Ops.set(
- @hardware,
- "devices",
- Builtins.prepend(
- Ops.get_list(@hardware, "devices", []),
- Ops.get_string(@hardware, "device", "")
- )
- )
- end
+ # list of free device names when e.g. adding new device
+ @hardware["devices"] = LanItems.new_type_devices(@hardware["realtype"], NEW_DEVICES_COUNT)
Ops.set(
@hardware,
@@ -344,7 +331,7 @@
Id(:ifcfg_name),
Opt(:editable, :hstretch),
_("&Configuration Name"),
- [@hardware["device"] || ""]
+ @hardware["devices"]
)
)
@@ -612,9 +599,7 @@
UI.ChangeWidget(
Id(:ifcfg_name),
:Items,
- LanItems.FreeDevices(@hardware["realtype"]).map do |index|
- @hardware["realtype"] + index
- end
+ LanItems.new_type_devices(@hardware["realtype"], NEW_DEVICES_COUNT)
)
end
Builtins.y2debug("type=%1", Ops.get_string(@hardware, "type", ""))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/include/network/lan/wireless.rb new/yast2-network-4.1.15/src/include/network/lan/wireless.rb
--- old/yast2-network-4.1.6/src/include/network/lan/wireless.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/include/network/lan/wireless.rb 2018-10-31 10:03:07.000000000 +0100
@@ -76,11 +76,11 @@
"opt" => [:notify],
"items" => [
# combo box item, one of WPA EAP modes
- ["TTLS", _("TTLS")],
- # combo box item, one of WPA EAP modes
["PEAP", _("PEAP")],
# combo box item, one of WPA EAP modes
- ["TLS", _("TLS")]
+ ["TLS", _("TLS")],
+ # combo box item, one of WPA EAP modes
+ ["TTLS", _("TTLS")]
],
"help" => _(
"<p>WPA-EAP uses a RADIUS server to authenticate users. There\n" \
@@ -1182,7 +1182,7 @@
InitializeWidget(key)
# enable/disable
mode = Ops.get_string(LanItems.wl_wpa_eap, "WPA_EAP_MODE", "")
- UI.ChangeWidget(Id(key), :Enabled, mode == "peap")
+ UI.ChangeWidget(Id(key), :Enabled, mode.casecmp("peap").zero?)
nil
end
@@ -1350,9 +1350,7 @@
auth_names = {
# combo box item, any of EAP authentication methods
- "" => _(
- "Any"
- ),
+ "" => _("Any"),
# combo box item, an EAP authentication method
"MD5" => _("MD5"),
# combo box item, an EAP authentication method
@@ -1362,13 +1360,9 @@
# combo box item, an EAP authentication method
"PAP" => _("PAP"),
# combo box item, an EAP authentication method
- "MSCHAP" => _(
- "MSCHAPv1"
- ),
+ "MSCHAP" => _("MSCHAPv1"),
# combo box item, an EAP authentication method
- "MSCHAPV2" => _(
- "MSCHAPv2"
- )
+ "MSCHAPV2" => _("MSCHAPv2")
}
auth_items = {
"TTLS" => ["", "MD5", "GTC", "CHAP", "PAP", "MSCHAP", "MSCHAPV2"],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/include/network/services/routing.rb new/yast2-network-4.1.15/src/include/network/services/routing.rb
--- old/yast2-network-4.1.6/src/include/network/services/routing.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/include/network/services/routing.rb 2018-10-31 10:03:07.000000000 +0100
@@ -222,7 +222,7 @@
end
route = Builtins.add(route, val)
val = Convert.to_string(UI.QueryWidget(Id(:genmask), :Value))
- if val != "-" && val != "0.0.0.0" && !valid_netmask?(val)
+ if val != "-" && !valid_netmask?(val)
# Popup::Error text
Popup.Error(_("Subnetmask is invalid."))
UI.SetFocus(Id(:genmask))
@@ -379,9 +379,19 @@
nil
end
+ # Checks if the param is valid IPv4 / IPv6
+ #
+ # @param gw [String] IPv4 or IPv6 address
+ # @return [Bolean] true if given param is valid
+ def valid_gateway?(gw)
+ !gw.nil? && (gw.empty? || IP.Check(gw))
+ end
+
+ # An input validator for the Routing dialog
def validateRouting(_key, _event)
gw = UI.QueryWidget(Id(:gw), :Value)
- return true if gw == "" || IP.Check(gw)
+
+ return true if valid_gateway?(gw)
Popup.Error(_("The default gateway is invalid."))
UI.SetFocus(Id(:gw))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/lib/network/clients/network_proposal.rb new/yast2-network-4.1.15/src/lib/network/clients/network_proposal.rb
--- old/yast2-network-4.1.6/src/lib/network/clients/network_proposal.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/lib/network/clients/network_proposal.rb 2018-10-31 10:03:07.000000000 +0100
@@ -24,7 +24,7 @@
def make_proposal(_)
{
- "preformatted_proposal" => Yast::Lan.Summary("summary").first,
+ "preformatted_proposal" => Yast::Lan.Summary("proposal"),
"label_proposal" => [Yast::LanItems.summary("one_line")]
}
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/lib/network/lan_items_summary.rb new/yast2-network-4.1.15/src/lib/network/lan_items_summary.rb
--- old/yast2-network-4.1.6/src/lib/network/lan_items_summary.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/lib/network/lan_items_summary.rb 2018-10-31 10:03:07.000000000 +0100
@@ -56,6 +56,29 @@
Summary.DevicesList(items)
end
+ # Generates a summary in RichText format for the configured interfaces
+ #
+ # @example
+ # LanItemsSummary.new.proposal
+ # => "<ul><li><p>Configured with DHCP: eth0, eth1<br></p></li>" \
+ # "<li><p>br0 (Bridge)<br>IP address: 192.168.122.60/24" \
+ # "<br>Bridge Ports: eth2 eth3</p></li></ul>"
+ #
+ # @see Summary
+ # @return [String] summary in RichText
+ def proposal
+ items = []
+
+ items << "<li>#{dhcp_summary}</li>" unless LanItems.find_dhcp_ifaces.empty?
+ items << "<li>#{static_summary}</li>" unless LanItems.find_static_ifaces.empty?
+ items << "<li>#{bridge_summary}</li>" unless bridges.empty?
+ items << "<li>#{bonding_summary}</li>" unless bonds.empty?
+
+ return Summary.NotConfigured if items.empty?
+
+ Summary.DevicesList(items)
+ end
+
# Generates a one line text summary for the configured interfaces.
#
# @example with one configured interface
@@ -109,5 +132,49 @@
LanItems.DeviceProtocol(ifcfg)
end
end
+
+ # Return a summary of the interfaces configurew with DHCP
+ #
+ # @return [String] interfaces configured with DHCP summary
+ def dhcp_summary
+ # TRANSLATORS: %s is the list of interfaces configured by DHCP
+ _("Configured with DHCP: %s") % LanItems.find_dhcp_ifaces.sort.join(", ")
+ end
+
+ # Return a summary of the interfaces configured statically
+ #
+ # @return [String] statically configured interfaces summary
+ def static_summary
+ # TRANSLATORS: %s is the list of interfaces configured by DHCP
+ _("Statically configured: %s") % LanItems.find_static_ifaces.sort.join(", ")
+ end
+
+ # Return a summary of the configured bridge interfaces
+ #
+ # @return [String] bridge configured interfaces summary
+ def bridge_summary
+ _("Bridges: %s") % bridges.map { |n| "#{n} (#{LanItems.bridge_slaves(n).sort.join(", ")})" }
+ end
+
+ # Return a summary of the configured bonding interfaces
+ #
+ # @return [String] bonding configured interfaces summary
+ def bonding_summary
+ _("Bonds: %s") % bonds.map { |n| "#{n} (#{LanItems.GetBondSlaves(n).sort.join(", ")})" }
+ end
+
+ # Convenience method that obtains the list of bonding configured interfaces
+ #
+ # @return [Array<String>] bonding configured interface names
+ def bonds
+ LanItems.getNetworkInterfaces("bond").sort
+ end
+
+ # Convenience method that obtains the list of bridge configured interfaces
+ #
+ # @return [Array<String>] bridge configured interface names
+ def bridges
+ LanItems.getNetworkInterfaces("br").sort
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/lib/network/network_autoyast.rb new/yast2-network-4.1.15/src/lib/network/network_autoyast.rb
--- old/yast2-network-4.1.6/src/lib/network/network_autoyast.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/lib/network/network_autoyast.rb 2018-10-31 10:03:07.000000000 +0100
@@ -17,6 +17,7 @@
def initialize
# import has to be done here, there are some collisions otherwise
+ Yast.import "Arch"
Yast.import "Lan"
Yast.import "LanItems"
Yast.import "Linuxrc"
@@ -72,6 +73,10 @@
no_rules &&= ex_udev_rules.empty?
return if no_rules
+ # for the purpose of setting the persistent names, create the devices 1st
+ s390_devices = ay_networking_section.fetch("s390-devices", {})
+ s390_devices.each { |rule| LanItems.createS390Device(rule) } if Arch.s390
+
LanItems.Read
# implicitly defined udev rules are overwritten by explicit ones in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/lib/network/wicked.rb new/yast2-network-4.1.15/src/lib/network/wicked.rb
--- old/yast2-network-4.1.6/src/lib/network/wicked.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/lib/network/wicked.rb 2018-10-31 10:03:07.000000000 +0100
@@ -16,5 +16,21 @@
SCR.Execute(BASH_PATH, "wicked ifreload #{devs.join(" ")}").zero?
end
+
+ # Parses wicked runtime configuration and returns list of ntp servers
+ #
+ # @param iface [String] network device
+ # @return [Array<String>] list of NTP servers
+ def parse_ntp_servers(iface)
+ raise ArgumentError, "A network device has to be specified" if iface.nil? || iface.empty?
+ raise "Parsing NTP Servers not supported for network service in use" if !NetworkService.is_wicked
+
+ lease_files = ["ipv4", "ipv6"].map { |ip| "/var/lib/wicked/lease-#{iface}-dhcp-#{ip}.xml" }
+ lease_files.find_all { |f| File.file?(f) }.reduce([]) do |stack, file|
+ result = SCR.Execute(path(".target.bash_output"), "wicked xpath --file #{file} \"%{//ntp/server}\"")
+
+ stack + result.fetch("stdout", "").split("\n")
+ end
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/modules/Lan.rb new/yast2-network-4.1.15/src/modules/Lan.rb
--- old/yast2-network-4.1.6/src/modules/Lan.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/modules/Lan.rb 2018-10-31 10:03:07.000000000 +0100
@@ -794,26 +794,18 @@
end
# Create a textual summary and a list of unconfigured devices
- # @param [String] mode "split": split configured and unconfigured?<br />
- # "summary": add resolver and routing symmary,
- # "proposal": for proposal, add links for direct config
+ # @param [String] mode "summary": add resolver and routing summary,
+ # "proposal": for proposal also with resolver an routing summary
# @return summary of the current configuration
def Summary(mode)
- sum = LanItems.BuildLanOverview
-
- # Testing improved summary
- if mode == "summary"
- Ops.set(
- sum,
- 0,
- Ops.add(
- Ops.add(Ops.get_string(sum, 0, ""), DNS.Summary),
- Routing.Summary
- )
- )
+ case mode
+ when "summary"
+ "#{LanItems.BuildLanOverview.first}#{DNS.Summary}#{Routing.Summary}"
+ when "proposal"
+ "#{LanItems.summary(:proposal)}#{DNS.Summary}#{Routing.Summary}"
+ else
+ LanItems.BuildLanOverview.first
end
-
- deep_copy(sum)
end
# Create a textual summary for the general network settings
@@ -948,7 +940,7 @@
# then each configuration (except bridges) move to the bridge
# and add old device name into bridge_ports
LanItems.Items.each do |current, config|
- bridge_name = format("br%s", NetworkInterfaces.GetFreeDevice("br"))
+ bridge_name = LanItems.new_type_device("br")
next unless connected_and_bridgeable?(bridge_name, current, config)
LanItems.current = current
# first configure all connected unconfigured devices with dhcp (with default parameters)
@@ -972,9 +964,8 @@
if NetworkService.is_network_manager
pkgs << "NetworkManager" if !PackageSystem.Installed("NetworkManager")
elsif !PackageSystem.Installed("wpa_supplicant")
- # we have to add wpa_supplicant when wpa is in game, wicked relies on it
- pkgs << "wpa_supplicant" if !NetworkInterfaces.Locate("WIRELESS_AUTH_MODE", "psk").empty?
- pkgs << "wpa_supplicant" if !NetworkInterfaces.Locate("WIRELESS_AUTH_MODE", "eap").empty?
+ # we have to add wpa_supplicant when wlan is in game, wicked relies on it
+ pkgs << "wpa_supplicant" if !LanItems.find_type_ifaces("wlan").empty?
end
pkgs.uniq!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/src/modules/LanItems.rb new/yast2-network-4.1.15/src/modules/LanItems.rb
--- old/yast2-network-4.1.6/src/modules/LanItems.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/src/modules/LanItems.rb 2018-10-31 10:03:07.000000000 +0100
@@ -931,6 +931,18 @@
GetDeviceNames(GetNetcardInterfaces())
end
+ # Finds all items of given device type
+ #
+ # @param type [String] device type
+ # @return [Array] list of device names
+ def find_type_ifaces(type)
+ items = GetNetcardInterfaces().select do |iface|
+ GetDeviceType(iface) == type
+ end
+
+ GetDeviceNames(items)
+ end
+
# Finds all NICs configured with DHCP
#
# @return [Array<String>] list of NIC names which are configured to use (any) dhcp
@@ -940,6 +952,15 @@
end
end
+ # Find all NICs configured statically
+ #
+ # @return [Array<String>] list of NIC names which have a static config
+ def find_static_ifaces
+ find_by_sysconfig do |ifcfg|
+ ifcfg.fetch("BOOTPROTO", "").match(/static/i)
+ end
+ end
+
# Finds all devices which has DHCLIENT_SET_HOSTNAME set to "yes"
#
# @return [Array<String>] list of NIC names which has the option set to "yes"
@@ -971,14 +992,15 @@
# Get list of all configured interfaces
#
+ # @param type [String] only obtains configured interfaces of the given type
# return [Array] list of strings - interface names (eth0, ...)
# FIXME: rename e.g. to configured_interfaces
- def getNetworkInterfaces
+ def getNetworkInterfaces(type = nil)
configurations = NetworkInterfaces.FilterDevices("netcard")
- devtypes = NetworkInterfaces.CardRegex["netcard"].to_s.split("|")
+ devtypes = type ? [type] : NetworkInterfaces.CardRegex["netcard"].to_s.split("|")
- devtypes.inject([]) do |acc, type|
- conf = configurations[type].to_h
+ devtypes.inject([]) do |acc, conf_type|
+ conf = configurations[conf_type].to_h
acc.concat(conf.keys)
end
end
@@ -1667,13 +1689,6 @@
#-------------------
# PRIVATE FUNCTIONS
- # Return 10 free devices
- # @param [String] type device type
- # @return [Array] of 10 free devices
- def FreeDevices(type)
- NetworkInterfaces.GetFreeDevices(type, 10)
- end
-
def SetDefaultsForHW
Builtins.y2milestone("SetDefaultsForHW type %1", @type)
@mtu = "1492" if Arch.s390 && Builtins.contains(["lcs", "eth"], @type)
@@ -1868,7 +1883,7 @@
# FIXME: encapsulate into LanItems.GetItemType ?
@type = Ops.get_string(@Items, [@current, "hwinfo", "type"], "eth")
- @device = @type + NetworkInterfaces.GetFreeDevice(@type)
+ @device = new_type_device(@type)
# TODO: instead of udev use hwinfo dev_name
NetworkInterfaces.Name = GetItemUdev("NAME")
@@ -2530,6 +2545,52 @@
ret
end
+ # Returns unused name for device of given type
+ #
+ # When already having eth0, eth1, enp0s3 devices (eth type) and asks for new
+ # device of eth type it will e.g. return eth2 as a free name.
+ #
+ # Method always returns name in the oldfashioned schema (eth0, br1, ...)
+ #
+ # @raise [ArgumentError] when type is nil or empty
+ # @param type [String] device type
+ # @return [String] available device name
+ def new_type_device(type)
+ new_type_devices(type, 1).first
+ end
+
+ # Returns a list of unused names for devices of given type
+ #
+ # Also @see new_type_device
+ #
+ # @raise [ArgumentError] when type is nil or empty
+ # @param type [String] device type
+ # @param count [Integer] requested count of names
+ # @return [Array<String>] list of free names, empty if count is < 1
+ def new_type_devices(type, count)
+ raise ArgumentError, "Valid device type expected" if type.nil? || type.empty?
+ return [] if count < 1
+
+ known_devs = find_type_ifaces(type)
+
+ candidates = (0..known_devs.size + count - 1).map { |c| "#{type}#{c}" }
+
+ (candidates - known_devs)[0..count - 1]
+ end
+
+ # Returns hash of NTP servers
+ #
+ # Provides map with NTP servers obtained via any of dhcp aware interfaces
+ #
+ # @return [Hash<String, Array<String>] key is device name, value
+ # is list of ntp servers obtained from the device
+ def dhcp_ntp_servers
+ dhcp_ifaces = find_dhcp_ifaces
+
+ result = dhcp_ifaces.map { |iface| [iface, parse_ntp_servers(iface)] }.to_h
+ result.delete_if { |_, ntps| ntps.empty? }
+ end
+
# This helper allows YARD to extract DSL-defined attributes.
# Unfortunately YARD has problems with the Capitalized ones,
# so those must be done manually.
@@ -2540,8 +2601,6 @@
publish variable: name, type: type
end
- private
-
# Returns a formated string with the interfaces that are part of a bridge
# or of a bond interface.
#
@@ -2570,6 +2629,8 @@
false
end
+ private
+
# Checks if given lladdr can be written into ifcfg
#
# @param lladdr [String] logical link address, usually MAC address in case
@@ -2763,7 +2824,7 @@
#
# ifcfg hash<string, string> is in form { <sysconfig_key> -> <value> }
#
- # @return [Array] list of device names
+ # @return [Array<String>] list of device names
def find_by_sysconfig
items = GetNetcardInterfaces().select do |iface|
ifcfg = GetDeviceMap(iface) || {}
@@ -2882,7 +2943,6 @@
publish function: :isCurrentDHCP, type: "boolean ()"
publish function: :GetItemDescription, type: "string ()"
publish function: :SelectHWMap, type: "void (map)"
- publish function: :FreeDevices, type: "list (string)"
publish function: :SetDefaultsForHW, type: "void ()"
publish function: :SetDeviceVars, type: "void (map, map)"
publish function: :Select, type: "boolean (string)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/t/add-del.t new/yast2-network-4.1.15/t/add-del.t
--- old/yast2-network-4.1.6/t/add-del.t 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/t/add-del.t 2018-10-31 10:03:07.000000000 +0100
@@ -23,7 +23,7 @@
echo "ok 1 $BASEDEVICE: found"
echo "# add a (virtual) interface"
-$YAST lan add name=vlan50 ethdevice=$BASEDEVICE bootproto=dhcp || tapfail
+$YAST lan add name=vlan50 type=vlan ethdevice=$BASEDEVICE bootproto=dhcp || tapfail
echo "ok 2 vlan50: added"
# check it has worked
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/Makefile.am new/yast2-network-4.1.15/test/Makefile.am
--- old/yast2-network-4.1.6/test/Makefile.am 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-TESTS = \
- alias_dialog_test.rb \
- bond_test.rb \
- bridge_test.rb \
- build_lan_overview_test.rb \
- complex_test.rb \
- default_route_test.rb \
- dns_service_test.rb \
- dns_test.rb \
- edit_nic_name_test.rb \
- hardware_test.rb \
- host_test.rb \
- ifroute_test.rb \
- inst_setup_dhcp_test.rb \
- install_inf_convertor_test.rb \
- lan_items_export_test.rb \
- lan_items_helpers_test.rb \
- lan_items_read_test.rb \
- lan_items_rollback_test.rb \
- lan_test.rb \
- lan_udev_auto_test.rb \
- link_handlers_test.rb \
- netcard_test.rb \
- network_autoconfiguration_test.rb \
- network_autoyast_test.rb \
- new_device_startmode_test.rb \
- read_hardware_test.rb \
- remote_test.rb \
- routines_test.rb \
- routing_test.rb \
- routing_helpers_test.rb \
- s390_helpers_test.rb \
- suse_firewall_4_network_test.rb \
- udev_test.rb \
- widgets_test.rb \
- yaml_defaults_test.rb
-
-TEST_EXTENSIONS = .rb
-RB_LOG_COMPILER = rspec --format doc
-VERBOSE = 1
-EXTRA_DIST = $(TESTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/bridge_test.rb new/yast2-network-4.1.15/test/bridge_test.rb
--- old/yast2-network-4.1.6/test/bridge_test.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/bridge_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -70,6 +70,8 @@
allow(Yast::NetworkInterfaces).to receive(:FilterDevices).with("netcard") { netconfig_items }
allow(Yast::NetworkInterfaces).to receive(:adapt_old_config!)
allow(Yast::NetworkInterfaces).to receive(:CleanHotplugSymlink).and_return(true)
+ allow(Yast::NetworkInterfaces).to receive(:GetType).and_call_original
+ allow(Yast::NetworkInterfaces).to receive(:GetType).with("tun0").and_return("tun") # tun type detection relies on sysfs
allow(Yast::LanItems).to receive(:ReadHardware) { hwinfo_items }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/build_lan_overview_test.rb new/yast2-network-4.1.15/test/build_lan_overview_test.rb
--- old/yast2-network-4.1.6/test/build_lan_overview_test.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/build_lan_overview_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -45,6 +45,13 @@
allow(Yast::NetworkInterfaces)
.to receive(:Current)
.and_return(wlan_ifcfg)
+ allow(Yast::NetworkInterfaces)
+ .to receive(:GetType)
+ .and_call_original
+ allow(Yast::NetworkInterfaces)
+ .to receive(:GetType)
+ .with("wlan0")
+ .and_return("wlan")
allow(FastGettext)
.to receive(:locale)
.and_return("de")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/inst_setup_dhcp_test.rb new/yast2-network-4.1.15/test/inst_setup_dhcp_test.rb
--- old/yast2-network-4.1.6/test/inst_setup_dhcp_test.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/inst_setup_dhcp_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -8,28 +8,33 @@
subject { Yast::SetupDhcp.instance }
describe "#main" do
+ let(:nac) { Yast::NetworkAutoconfiguration.instance }
- it "returns :next when autoconfiguration is performed" do
- allow(Yast::NetworkAutoconfiguration)
+ it "returns :next when autoconfiguration is not performed" do
+ allow(nac)
.to receive(:any_iface_active?)
.and_return(true)
expect(subject.main).to eql :next
end
- it "returns :next when autoconfiguration is not performed" do
- allow(Yast::NetworkAutoconfiguration)
+ it "returns :next when autoconfiguration is performed" do
+ allow(nac)
.to receive(:any_iface_active?)
.and_return(false)
+ allow(nac)
+ .to receive(:configure_dhcp)
+ .and_return(true)
expect(subject.main).to eql :next
end
it "runs network dhcp autoconfiguration if no active interfaces" do
- allow(Yast::NetworkAutoconfiguration)
+ allow(nac)
.to receive(:any_iface_active?)
.and_return(false)
- expect(Yast::NetworkAutoconfiguration.instance)
+
+ expect(nac)
.to receive(:configure_dhcp)
subject.main
@@ -37,6 +42,10 @@
context "in the initial Stage" do
it "writes DHCLIENT_SET_HOSTNAME in /etc/sysconfig/network/dhcp" do
+ allow(nac)
+ .to receive(:any_iface_active?)
+ .and_return(true)
+
expect(Yast::Stage).to receive(:initial).and_return(true)
expect(subject).to receive(:set_dhcp_hostname!)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/lan_items_helpers_test.rb new/yast2-network-4.1.15/test/lan_items_helpers_test.rb
--- old/yast2-network-4.1.6/test/lan_items_helpers_test.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/lan_items_helpers_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -97,6 +97,13 @@
allow(Yast::NetworkInterfaces).to receive(:FilterDevices) { NETCONFIG_ITEMS }
expect(Yast::LanItems.getNetworkInterfaces).to match_array(EXPECTED_INTERFACES)
end
+
+ context "when a type is given" do
+ it "returns the list of known interfaces of the given type" do
+ allow(Yast::NetworkInterfaces).to receive(:FilterDevices) { NETCONFIG_ITEMS }
+ expect(Yast::LanItems.getNetworkInterfaces("br")).to eql(["br0"])
+ end
+ end
end
describe "LanItemsClass#s390_correct_lladdr" do
@@ -311,6 +318,117 @@
end
end
+describe "LanItems#find_type_ifaces" do
+ let(:mocked_items) do
+ {
+ 0 => { "ifcfg" => "eth0" },
+ 1 => { "hwinfo" => { "dev_name" => "enp0s3" } },
+ 2 => { "ifcfg" => "bond0" }
+ }
+ end
+
+ before(:each) do
+ allow(Yast::LanItems).to receive(:Items).and_return(mocked_items)
+
+ allow(Yast::LanItems).to receive(:GetDeviceType).and_return("eth")
+ allow(Yast::LanItems).to receive(:GetDeviceType).with(0).and_return("eth")
+ allow(Yast::LanItems).to receive(:GetDeviceType).with(1).and_return("eth")
+ allow(Yast::LanItems).to receive(:GetDeviceType).with(2).and_return("bond")
+ end
+
+ it "lists all eth devices when asked for" do
+ expect(Yast::LanItems.send(:find_type_ifaces, "eth")).to eql ["eth0", "enp0s3"]
+ end
+
+ it "returns an empty array when invalid type is given" do
+ expect(Yast::LanItems.send(:find_type_ifaces, nil)).to eql []
+ end
+end
+
+context "When proposing device names candidates" do
+ before(:each) do
+ allow(Yast::LanItems).to receive(:find_type_ifaces).and_return([])
+ allow(Yast::LanItems).to receive(:find_type_ifaces).with("eth").and_return(["eth0", "eth2", "eth3"])
+ end
+
+ describe "LanItems#new_type_device" do
+ it "generates a valid device name" do
+ expect(Yast::LanItems.new_type_device("br")).to eql "br0"
+ expect(Yast::LanItems.new_type_device("eth")).to eql "eth1"
+ end
+
+ it "raises an error when no type is provided" do
+ expect { Yast::LanItems.new_type_device(nil) }.to raise_error(ArgumentError)
+ end
+ end
+
+ describe "LanItems#new_type_devices" do
+ it "generates as many new device names as requested" do
+ candidates = Yast::LanItems.new_type_devices("eth", 10)
+
+ expect(candidates.size).to eql 10
+ expect(candidates).not_to include("eth0", "eth2", "eth3")
+ end
+
+ it "returns empty lists for device name count < 1" do
+ expect(Yast::LanItems.new_type_devices("eth", 0)).to be_empty
+ expect(Yast::LanItems.new_type_devices("eth", -1)).to be_empty
+ end
+ end
+
+ describe "LanItems#dhcp_ntp_servers" do
+ it "lists ntp servers for every device which provides them" do
+ result = {
+ "eth0" => ["1.0.0.1"],
+ "eth1" => ["1.0.0.2", "1.0.0.3"]
+ }
+
+ allow(Yast::LanItems)
+ .to receive(:parse_ntp_servers)
+ .and_return([])
+ allow(Yast::LanItems)
+ .to receive(:parse_ntp_servers)
+ .with("eth0")
+ .and_return(["1.0.0.1"])
+ allow(Yast::LanItems)
+ .to receive(:parse_ntp_servers)
+ .with("eth1")
+ .and_return(["1.0.0.2", "1.0.0.3"])
+ allow(Yast::LanItems)
+ .to receive(:find_dhcp_ifaces)
+ .and_return(["eth0", "eth1", "eth2"])
+
+ expect(Yast::LanItems.dhcp_ntp_servers).to eql result
+ end
+ end
+end
+
+describe "LanItems#dhcp_ntp_servers" do
+ it "lists ntp servers for every device which provides them" do
+ result = {
+ "eth0" => ["1.0.0.1"],
+ "eth1" => ["1.0.0.2", "1.0.0.3"]
+ }
+
+ allow(Yast::LanItems)
+ .to receive(:parse_ntp_servers)
+ .and_return([])
+ allow(Yast::LanItems)
+ .to receive(:parse_ntp_servers)
+ .with("eth0")
+ .and_return(["1.0.0.1"])
+ allow(Yast::LanItems)
+ .to receive(:parse_ntp_servers)
+ .with("eth1")
+ .and_return(["1.0.0.2", "1.0.0.3"])
+ allow(Yast::LanItems)
+ .to receive(:find_dhcp_ifaces)
+ .and_return(["eth0", "eth1", "eth2"])
+
+ expect(Yast::LanItems.dhcp_ntp_servers).to eql result
+ end
+end
+
describe "DHCLIENT_SET_HOSTNAME helpers" do
def mock_items(dev_maps)
# mock LanItems#Items
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/lan_items_summary_test.rb new/yast2-network-4.1.15/test/lan_items_summary_test.rb
--- old/yast2-network-4.1.6/test/lan_items_summary_test.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/lan_items_summary_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -12,7 +12,10 @@
[
{ "BOOTPROTO" => "dhcp" },
{ "BOOTPROTO" => "none" },
- { "IPADDR" => "1.2.3.4", "NETMASK" => "255.255.255.0" }
+ { "BOOTPROTO" => "static",
+ "IPADDR" => "1.2.3.4",
+ "NETMASK" => "255.255.255.0",
+ "BRIDGE_PORTS" => "eth1" }
].freeze
end
@@ -27,9 +30,11 @@
before do
allow(Yast::LanItems).to receive(:Items).and_return(items)
allow(Yast::LanItems).to receive(:IsItemConfigured).and_return(true)
+ allow(Yast::NetworkInterfaces).to receive(:FilterDevices).with("netcard").and_return("br" => { "br0" => dhcp_maps[2] })
dhcp_maps.each_with_index do |item, index|
allow(Yast::LanItems).to receive(:GetDeviceMap).with(index).and_return(item)
end
+ allow(subject).to receive(:bridges).and_return(["br0"])
end
describe "#default" do
@@ -49,6 +54,26 @@
end
end
+ describe "#proposal" do
+ it "returns a Richtext summary of the configured interfaces" do
+ expect(subject.proposal)
+ .to eql "<ul>" \
+ "<li>Configured with DHCP: eth0</li>" \
+ "<li>Statically configured: br0</li>" \
+ "<li>Bridges: br0 (eth1)</li>" \
+ "</ul>"
+ end
+
+ it "returns Summary.NotConfigured in case of not configured interfaces" do
+ allow(Yast::LanItems).to receive(:find_dhcp_ifaces).and_return([])
+ allow(Yast::LanItems).to receive(:find_static_ifaces).and_return([])
+ allow(subject).to receive(:bridges).and_return([])
+ allow(subject).to receive(:bonds).and_return([])
+
+ expect(subject.proposal).to eql Yast::Summary.NotConfigured
+ end
+ end
+
describe "#one_line" do
it "returns a plain text summary of the configured interfaces in one line" do
expect(subject.one_line).to eql(MULTIPLE_INTERFACES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/lan_test.rb new/yast2-network-4.1.15/test/lan_test.rb
--- old/yast2-network-4.1.6/test/lan_test.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/lan_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -24,22 +24,10 @@
.and_return(false)
end
- it "does not list wpa_supplicant package when WIRELESS_AUTH_MODE is not psk or eap" do
- expect(Yast::NetworkInterfaces)
- .to receive(:Locate)
- .with("WIRELESS_AUTH_MODE", /(psk|eap)/)
- .at_least(:once)
- .and_return([])
-
- expect(Yast::Lan.Packages).not_to include "wpa_supplicant"
- end
-
- it "lists wpa_supplicant package when WIRELESS_AUTH_MODE is psk or eap" do
- # when checking options, LanClass#Packages currently cares only if
- # WIRELESS_AUTH_MODE={psk, eap} is present
- expect(Yast::NetworkInterfaces)
- .to receive(:Locate)
- .with("WIRELESS_AUTH_MODE", /(psk|eap)/)
+ it "always proposes wpa_supplicant" do
+ expect(Yast::LanItems)
+ .to receive(:find_type_ifaces)
+ .with("wlan")
.at_least(:once)
.and_return(["place_holder"])
@@ -319,7 +307,6 @@
describe "LanClass#ProposeVirtualized" do
before do
- allow(Yast::NetworkInterfaces).to receive(:GetFreeDevice).with("br").and_return("1")
allow(Yast::LanItems).to receive(:IsCurrentConfigured).and_return(true)
allow(Yast::Lan).to receive(:ProposeItem)
allow(Yast::Lan).to receive(:configure_as_bridge!)
@@ -367,20 +354,20 @@
end
it "configures a new bridge with the given interface as a bridge port" do
- expect(Yast::Lan).to receive(:configure_as_bridge!).with("eth0", "br1")
+ expect(Yast::Lan).to receive(:configure_as_bridge!).with("eth0", "br0")
Yast::Lan.ProposeVirtualized
end
it "configures the given interface as a bridge port" do
- expect(Yast::Lan).to receive(:configure_as_bridge!).with("eth0", "br1").and_return(true)
+ expect(Yast::Lan).to receive(:configure_as_bridge!).with("eth0", "br0").and_return(true)
expect(Yast::Lan).to receive(:configure_as_bridge_port).with("eth0")
Yast::Lan.ProposeVirtualized
end
it "refreshes lan items with the new interfaces" do
- expect(Yast::Lan).to receive(:configure_as_bridge!).with("eth0", "br1").and_return(true)
+ expect(Yast::Lan).to receive(:configure_as_bridge!).with("eth0", "br0").and_return(true)
expect(Yast::Lan).to receive(:configure_as_bridge_port).with("eth0")
expect(Yast::Lan).to receive(:refresh_lan_items)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/network_proposal_test.rb new/yast2-network-4.1.15/test/network_proposal_test.rb
--- old/yast2-network-4.1.6/test/network_proposal_test.rb 2018-08-23 18:01:38.000000000 +0200
+++ new/yast2-network-4.1.15/test/network_proposal_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env rspec
require_relative "test_helper"
require "network/clients/network_proposal"
@@ -9,7 +10,7 @@
before do
stub_const("Yast::Wizard", double.as_null_object)
allow(Yast::LanItems).to receive(:summary).with("one_line").and_return("one_line_summary")
- allow(Yast::Lan).to receive(:Summary).with("summary").and_return(["rich_text_summary", ""])
+ allow(Yast::Lan).to receive(:Summary).with("proposal").and_return("rich_text_summary")
end
describe "#description" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.1.6/test/wireless_test.rb new/yast2-network-4.1.15/test/wireless_test.rb
--- old/yast2-network-4.1.6/test/wireless_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-4.1.15/test/wireless_test.rb 2018-10-31 10:03:07.000000000 +0100
@@ -0,0 +1,31 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+require "yast"
+
+Yast.import "LanItems"
+
+class WirelessTestClass < Yast::Module
+ def initialize
+ Yast.include self, "network/lan/address.rb" # defines my2debug, but nothing mention it
+ Yast.include self, "network/lan/wireless.rb"
+ end
+end
+
+describe "WirelessInclude" do
+ subject { WirelessTestClass.new }
+
+ describe "#InitPeapVersion" do
+ before do
+ allow(Yast::UI).to receive(:ChangeWidget)
+ end
+
+ it "Enables widget if WPA_EAP_MODE is PEAP" do
+ Yast::LanItems.wl_wpa_eap["WPA_EAP_MODE"] = "PEAP"
+ expect(Yast::UI).to receive(:ChangeWidget).with(Id("test"), :Enabled, true)
+
+ subject.InitPeapVersion("test")
+ end
+ end
+end
1
0
Hello community,
here is the log from the commit of package snapper for openSUSE:Factory checked in at 2018-11-01 19:08:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/snapper (Old)
and /work/SRC/openSUSE:Factory/.snapper.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "snapper"
Thu Nov 1 19:08:50 2018 rev:104 rq:645497 version:0.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2018-10-11 11:44:59.934821394 +0200
+++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2018-11-01 19:08:54.630031154 +0100
@@ -1,0 +2,29 @@
+Mon Oct 29 10:38:59 CET 2018 - aschnell(a)suse.com
+
+- extended space aware cleanup algorithm to ensure minimal
+ free space for btrfs (within known ranges) (fate#325774)
+- version 0.8.0
+
+-------------------------------------------------------------------
+Mon Oct 22 09:52:01 CEST 2018 - aschnell(a)suse.com
+
+- fixed querying default and active snapshot if compiled without
+ rollback support (gh#openSUSE/snapper#442)
+- version 0.7.2
+
+-------------------------------------------------------------------
+Tue Oct 16 14:00:56 CEST 2018 - aschnell(a)suse.com
+
+- disallow to delete special (for btrfs currently mounted and next
+ to be mounted) snapshots (fate#326479)
+- version 0.7.1
+
+-------------------------------------------------------------------
+Thu Oct 11 11:10:11 CEST 2018 - aschnell(a)suse.com
+
+- mark active and default btrfs subvolume in list output
+ (fate#326479)
+- reorder columns in snapper list output (fate#326479)
+- version 0.7.0
+
+-------------------------------------------------------------------
Old:
----
snapper-0.6.1.tar.bz2
New:
----
snapper-0.8.0.tar.bz2
snapper-xUbuntu_18.10.dsc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ snapper.spec ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.190031184 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.190031184 +0100
@@ -22,7 +22,7 @@
%endif
Name: snapper
-Version: 0.6.1
+Version: 0.8.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: snapper-%{version}.tar.bz2
++++++ debian.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/changelog new/debian/changelog
--- old/debian/changelog 2018-10-09 02:00:00.000000000 +0200
+++ new/debian/changelog 2018-10-30 01:00:00.000000000 +0100
@@ -1,3 +1,21 @@
+snapper (0.8.0) stable; urgency=low
+
+ * Updated to version 0.8.0
+
+ -- Arvin Schnell <aschnell(a)suse.com> Mon, 29 Oct 2018 09:02:13 +0100
+
+snapper (0.7.2) stable; urgency=low
+
+ * Updated to version 0.7.2
+
+ -- Arvin Schnell <aschnell(a)suse.com> Mon, 22 Oct 2018 09:57:01 +0200
+
+snapper (0.7.1) stable; urgency=low
+
+ * Updated to version 0.7.1
+
+ -- Arvin Schnell <aschnell(a)suse.com> Tue, 16 Oct 2018 14:02:07 +0200
+
snapper (0.6.0) stable; urgency=low
* Updated to version 0.6.0
++++++ snapper-0.6.1.tar.bz2 -> snapper-0.8.0.tar.bz2 ++++++
++++ 6342 lines of diff (skipped)
++++++ snapper-Debian_7.0.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.646031209 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.646031209 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-Debian_8.0.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.658031210 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.658031210 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-Debian_9.0.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.674031211 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.674031211 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_14.04.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.686031211 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.690031212 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_14.10.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.702031212 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.702031212 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_15.04.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.714031213 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.714031213 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_15.10.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.730031214 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.730031214 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_16.04.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.746031214 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.746031214 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_16.10.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.762031215 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.766031215 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_17.04.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.778031216 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.786031217 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_17.10.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.806031218 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.810031218 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_18.04.dsc ++++++
--- /var/tmp/diff_new_pack.EDqTn7/_old 2018-11-01 19:08:55.822031219 +0100
+++ /var/tmp/diff_new_pack.EDqTn7/_new 2018-11-01 19:08:55.822031219 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: snapper
-Version: 0.6.1
+Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
@@ -11,4 +11,4 @@
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
-c2f2d7c976a3663d28dfb3ecee783f88 586180 snapper-0.6.1.tar.bz2
+20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
++++++ snapper-xUbuntu_18.10.dsc ++++++
Format: 1.0
Source: snapper
Version: 0.8.0
Binary: snapper
Maintainer: Arvin Schnell <aschnell(a)suse.com>
Architecture: any
Build-Depends: debhelper (>= 4.1.16), acl-dev, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de
#
# The 'Files' line is generated during 'make package':
# Files:
# 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
#
Files:
20ffd10345e38bdc4bd51f75cd8233fd 591033 snapper-0.8.0.tar.bz2
1
0
Hello community,
here is the log from the commit of package rubygem-yast-rake for openSUSE:Factory checked in at 2018-11-01 19:08:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-yast-rake (Old)
and /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-yast-rake"
Thu Nov 1 19:08:14 2018 rev:24 rq:645466 version:0.2.28
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-yast-rake/rubygem-yast-rake.changes 2018-07-24 17:28:44.191785159 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new/rubygem-yast-rake.changes 2018-11-01 19:08:16.842029081 +0100
@@ -1,0 +2,19 @@
+Tue Oct 30 07:47:42 UTC 2018 - lslezak(a)suse.cz
+
+- Changed the SLE12-SP4 SR target to the :Update subproject
+ (bsc#1113887)
+- 0.2.28
+
+-------------------------------------------------------------------
+Mon Oct 15 15:18:54 UTC 2018 - lslezak(a)suse.cz
+
+- Added CASP-4.0 target (needed for fate#325834)
+- 0.2.27
+
+-------------------------------------------------------------------
+Wed Aug 22 13:10:17 CEST 2018 - schubi(a)suse.de
+
+- Removed installation of file COPYING into the doc directory.
+ This file will be packed by the %license tag in the spec files.
+
+-------------------------------------------------------------------
Old:
----
yast-rake-0.2.26.gem
New:
----
yast-rake-0.2.28.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-yast-rake.spec ++++++
--- /var/tmp/diff_new_pack.iMvUOo/_old 2018-11-01 19:08:17.978029145 +0100
+++ /var/tmp/diff_new_pack.iMvUOo/_new 2018-11-01 19:08:18.018029147 +0100
@@ -17,7 +17,7 @@
Name: rubygem-yast-rake
-Version: 0.2.26
+Version: 0.2.28
Release: 0
%define mod_name yast-rake
%define mod_full_name %{mod_name}-%{version}
++++++ yast-rake-0.2.26.gem -> yast-rake-0.2.28.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION
--- old/VERSION 2018-04-10 12:38:47.000000000 +0200
+++ new/VERSION 2018-04-11 12:13:28.000000000 +0200
@@ -1 +1 @@
-0.2.26
+0.2.28
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/data/targets.yml new/data/targets.yml
--- old/data/targets.yml 2018-04-10 12:38:47.000000000 +0200
+++ new/data/targets.yml 2018-04-11 12:13:28.000000000 +0200
@@ -41,6 +41,11 @@
obs_project: "Devel:YaST:CASP:1.0"
obs_sr_project: "SUSE:SLE-12-SP2:Update:Products:CASP10"
obs_target: "CASP_1.0"
+:casp40:
+ obs_api: "https://api.suse.de/"
+ obs_project: "Devel:YaST:CASP:4.0"
+ obs_sr_project: "SUSE:SLE-15:Update:Products:CASP40"
+ obs_target: "CASP_4.0"
:sle12sp3:
obs_api: "https://api.suse.de/"
obs_project: "Devel:YaST:SLE-12-SP3"
@@ -53,7 +58,7 @@
:sle12sp4:
obs_api: "https://api.suse.de/"
obs_project: "Devel:YaST:SLE-12-SP4"
- obs_sr_project: "SUSE:SLE-12-SP4:GA"
+ obs_sr_project: "SUSE:SLE-12-SP4:Update"
obs_target: "SLE_12_SP4"
:sle15:
obs_api: "https://api.suse.de/"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/install.rake new/lib/tasks/install.rake
--- old/lib/tasks/install.rake 2018-04-10 12:38:47.000000000 +0200
+++ new/lib/tasks/install.rake 2018-04-11 12:13:28.000000000 +0200
@@ -40,19 +40,19 @@
# to FileUtils.cp_r as source and value as destination
def install_locations
@install_locations ||= {
- "**/src/clients" => YAST_DIR,
- "**/src/modules" => YAST_DIR,
- "**/src/include" => YAST_DIR,
- "**/src/lib" => YAST_DIR,
- "**/src/scrconf" => YAST_DIR,
- "**/src/data" => YAST_DIR,
- "**/src/servers_non_y2" => YAST_LIB_DIR,
- "**/src/bin" => YAST_LIB_DIR,
- "**/src/autoyast[_-]rnc/*" => AUTOYAST_RNC_DIR,
- "**/src/fillup/*" => fillup_dir,
- "**/src/desktop/*.desktop" => YAST_DESKTOP_DIR,
- "{README*,COPYING,CONTRIBUTING.md}" => install_doc_dir,
- "**/icons/*" => YAST_ICON_BASE_DIR
+ "**/src/clients" => YAST_DIR,
+ "**/src/modules" => YAST_DIR,
+ "**/src/include" => YAST_DIR,
+ "**/src/lib" => YAST_DIR,
+ "**/src/scrconf" => YAST_DIR,
+ "**/src/data" => YAST_DIR,
+ "**/src/servers_non_y2" => YAST_LIB_DIR,
+ "**/src/bin" => YAST_LIB_DIR,
+ "**/src/autoyast[_-]rnc/*" => AUTOYAST_RNC_DIR,
+ "**/src/fillup/*" => fillup_dir,
+ "**/src/desktop/*.desktop" => YAST_DESKTOP_DIR,
+ "{README*,CONTRIBUTING.md}" => install_doc_dir,
+ "**/icons/*" => YAST_ICON_BASE_DIR
}
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2018-07-19 16:48:52.000000000 +0200
+++ new/metadata 2018-10-30 09:25:21.000000000 +0100
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: yast-rake
version: !ruby/object:Gem::Version
- version: 0.2.26
+ version: 0.2.28
platform: ruby
authors:
- Josef Reidinger
autorequire:
bindir: bin
cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: rake
1
0
Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2018-11-01 19:07:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2"
Thu Nov 1 19:07:40 2018 rev:249 rq:645264 version:4.0.65
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2018-09-07 15:41:44.306386028 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2018-11-01 19:07:43.582027188 +0100
@@ -1,0 +2,33 @@
+Thu Oct 25 13:35:34 CEST 2018 - schubi(a)suse.de
+
+- Saving y2logs after the installation has been finished.
+ (fate#325737)
+- 4.0.65
+
+-------------------------------------------------------------------
+Mon Oct 22 08:25:08 WEST 2018 - igonzalezsosa(a)suse.com
+
+- Adapt schema to support the new way of defining a software
+ RAID (fate#326573).
+- 4.0.64
+
+-------------------------------------------------------------------
+Tue Oct 16 16:39:52 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Thu Oct 11 18:08:56 UTC 2018 - knut.anderssen(a)suse.com
+
+- AutoInstallRules: Do a cleanup of the profile being merged with
+ (bsc#1108933).
+- 4.0.63
+
+-------------------------------------------------------------------
+Fri Sep 28 07:20:35 UTC 2018 - knut.anderssen(a)suse.com
+
+- AutoYaST configuration module: Enable edit action for firewall
+ module (fate#324662).
+- 4.0.62
+
+-------------------------------------------------------------------
Old:
----
autoyast2-4.0.61.tar.bz2
New:
----
autoyast2-4.0.65.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.FsRGhZ/_old 2018-11-01 19:07:44.186027223 +0100
+++ /var/tmp/diff_new_pack.FsRGhZ/_new 2018-11-01 19:07:44.186027223 +0100
@@ -22,7 +22,7 @@
%endif
Name: autoyast2
-Version: 4.0.61
+Version: 4.0.65
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -309,6 +309,8 @@
%{_prefix}/lib/YaST2/bin/fetch_image.sh
%{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh
+%license COPYING
+
%dir /var/adm/autoinstall/
%dir /var/adm/autoinstall/scripts
%dir /var/adm/autoinstall/init.d
++++++ autoyast2-4.0.61.tar.bz2 -> autoyast2-4.0.65.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/package/autoyast2.changes new/autoyast2-4.0.65/package/autoyast2.changes
--- old/autoyast2-4.0.61/package/autoyast2.changes 2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/package/autoyast2.changes 2018-10-29 13:46:19.000000000 +0100
@@ -1,4 +1,37 @@
-------------------------------------------------------------------
+Thu Oct 25 13:35:34 CEST 2018 - schubi(a)suse.de
+
+- Saving y2logs after the installation has been finished.
+ (fate#325737)
+- 4.0.65
+
+-------------------------------------------------------------------
+Mon Oct 22 08:25:08 WEST 2018 - igonzalezsosa(a)suse.com
+
+- Adapt schema to support the new way of defining a software
+ RAID (fate#326573).
+- 4.0.64
+
+-------------------------------------------------------------------
+Tue Oct 16 16:39:52 CEST 2018 - schubi(a)suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Thu Oct 11 18:08:56 UTC 2018 - knut.anderssen(a)suse.com
+
+- AutoInstallRules: Do a cleanup of the profile being merged with
+ (bsc#1108933).
+- 4.0.63
+
+-------------------------------------------------------------------
+Fri Sep 28 07:20:35 UTC 2018 - knut.anderssen(a)suse.com
+
+- AutoYaST configuration module: Enable edit action for firewall
+ module (fate#324662).
+- 4.0.62
+
+-------------------------------------------------------------------
Thu Aug 23 14:25:55 CEST 2018 - schubi(a)suse.de
- AutoInstallRules: Fixed crash while merging profiles.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/package/autoyast2.spec new/autoyast2-4.0.65/package/autoyast2.spec
--- old/autoyast2-4.0.61/package/autoyast2.spec 2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/package/autoyast2.spec 2018-10-29 13:46:19.000000000 +0100
@@ -22,7 +22,7 @@
%endif
Name: autoyast2
-Version: 4.0.61
+Version: 4.0.65
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -309,6 +309,8 @@
%{_prefix}/lib/YaST2/bin/fetch_image.sh
%{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh
+%license COPYING
+
%dir /var/adm/autoinstall/
%dir /var/adm/autoinstall/scripts
%dir /var/adm/autoinstall/init.d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/autoyast-rnc/partitioning.rnc new/autoyast2-4.0.65/src/autoyast-rnc/partitioning.rnc
--- old/autoyast2-4.0.61/src/autoyast-rnc/partitioning.rnc 2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/autoyast-rnc/partitioning.rnc 2018-10-29 13:46:19.000000000 +0100
@@ -20,7 +20,8 @@
element disklabel { text }? &
element enable_snapshots { BOOLEAN }? &
skip_list? &
- partitions?
+ partitions? &
+ raid_options?
}
skip_list =
@@ -63,9 +64,7 @@
| part_partition_id
| part_partition_nr
| part_partition_type
- | part_raid_name
| part_resize
- | part_raid_options
| part_raid_type
| part_region
| part_size
@@ -75,6 +74,8 @@
| part_used_pool
| part_subvolumes_prefix
| device_order
+ | raid_name
+ | raid_options
| subvolumes
| create_subvolumes
@@ -116,9 +117,9 @@
opt_raid = element opt_raid { option_str, option_value }
opt_reserved_blocks =
element opt_reserved_blocks { option_str, option_value }
-part_raid_name = element raid_name { text }
+raid_name = element raid_name { text }
-part_raid_options = element raid_options { persistent_superblock? & chunk_size? & parity_algorithm? & raid_type? & device_order? & part_raid_name? }
+raid_options = element raid_options { persistent_superblock? & chunk_size? & parity_algorithm? & raid_type? & device_order? & raid_name? }
persistent_superblock = element persistent_superblock { BOOLEAN }
raid_type = element raid_type { text }
chunk_size = element chunk_size { text }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/clients/inst_autoconfigure.rb new/autoyast2-4.0.65/src/clients/inst_autoconfigure.rb
--- old/autoyast2-4.0.61/src/clients/inst_autoconfigure.rb 2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/clients/inst_autoconfigure.rb 2018-10-29 13:46:19.000000000 +0100
@@ -349,6 +349,9 @@
# Invoke SnapshotsFinish client to perform snapshots (if needed)
WFM.CallFunction("snapshots_finish", ["Write"])
+ # Saving y2logs
+ WFM.CallFunction("save_y2logs")
+
:next
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/fillup/sysconfig.autoinstall new/autoyast2-4.0.65/src/fillup/sysconfig.autoinstall
--- old/autoyast2-4.0.61/src/fillup/sysconfig.autoinstall 2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/fillup/sysconfig.autoinstall 2018-10-29 13:46:19.000000000 +0100
@@ -33,4 +33,4 @@
#
# Listed modules have Edit button / action disabled at AutoYaST UI
#
-FORBID_EDIT="firewall"
+FORBID_EDIT=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/modules/AutoInstallRules.rb new/autoyast2-4.0.65/src/modules/AutoInstallRules.rb
--- old/autoyast2-4.0.61/src/modules/AutoInstallRules.rb 2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/modules/AutoInstallRules.rb 2018-10-29 13:46:19.000000000 +0100
@@ -912,25 +912,26 @@
def Merge(result_profile)
base_profile = File.join(AutoinstConfig.tmpDir, "base_profile.xml")
merge_profile = File.join(AutoinstConfig.tmpDir, "result.xml")
+ cleaned_profile = File.join(AutoinstConfig.tmpDir, "current.xml")
ok = true
- skip = false
error = false
- @tomerge.each do |file|
+ @tomerge.each_with_index do |file, iter|
log.info("Working on file: #{file}")
current_profile = File.join(AutoinstConfig.local_rules_location, file)
- if !skip
- if !XML_cleanup(current_profile, base_profile)
- log.error("Error reading XML file")
- message = _(
- "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
- )
- message += XML.XMLError
- Yast2::Popup.show(message, headline: :error)
- error = true
- end
- skip = true
- elsif !error
- xsltret = merge_profiles(base_profile, current_profile, merge_profile)
+ dest_profile = iter == 0 ? base_profile : cleaned_profile
+ if !XML_cleanup(current_profile, dest_profile)
+ log.error("Error reading XML file")
+ message = _(
+ "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
+ )
+ message += XML.XMLError
+ Yast2::Popup.show(message, headline: :error)
+ error = true
+ end
+
+ unless error
+ next if iter == 0
+ xsltret = merge_profiles(base_profile, cleaned_profile, merge_profile)
log.info("Merge result: #{xsltret}")
if xsltret["exit"] != 0 || xsltret.fetch("stderr", "") != ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/test/AutoInstallRules_test.rb new/autoyast2-4.0.65/test/AutoInstallRules_test.rb
--- old/autoyast2-4.0.61/test/AutoInstallRules_test.rb 2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/test/AutoInstallRules_test.rb 2018-10-29 13:46:19.000000000 +0100
@@ -283,8 +283,10 @@
describe '#Merge' do
let(:tmp_dir) { File.join(root_path, 'tmp') }
let(:result_path) { File.join(tmp_dir, 'result.xml') }
+ let(:first_path) { File.join(tmp_dir, 'first.xml') }
let(:second_path) { File.join(tmp_dir, 'second.xml') }
let(:base_profile_path) { File.join(tmp_dir, 'base_profile.xml') }
+ let(:cleaned_profile_path) { File.join(tmp_dir, 'current.xml') }
around(:each) do |example|
FileUtils.rm_rf(tmp_dir) if Dir.exist?(tmp_dir)
@@ -317,12 +319,25 @@
end
context 'when two XML profiles are given' do
- it 'merges two XML profiles' do
+ before do
subject.CreateFile("first.xml")
subject.CreateFile("second.xml")
- expect(subject).to receive(:XML_cleanup).at_least(:once).and_return(true)
- expect(subject).to receive(:merge_profiles).with(base_profile_path,
- second_path, result_path).and_return({ 'exit' => 0, 'stderr' => '', 'stdout' => '' })
+ allow(subject).to receive(:XML_cleanup).and_return(true)
+ end
+
+ it 'cleans up each profile before merging them' do
+ expect(subject).to receive(:XML_cleanup).with(first_path, base_profile_path)
+ .and_return(true)
+ expect(subject).to receive(:XML_cleanup).with(second_path, cleaned_profile_path)
+ .and_return(true)
+
+ subject.Merge(result_path)
+ end
+
+ it 'merges two XML profiles' do
+ expect(subject).to receive(:merge_profiles)
+ .with(base_profile_path, cleaned_profile_path, result_path)
+ .and_return({ 'exit' => 0, 'stderr' => '', 'stdout' => '' })
expect(subject.Merge(result_path)).to eq(true)
end
end
1
0
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2018-11-01 19:07:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Thu Nov 1 19:07:06 2018 rev:194 rq:645202 version:4.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2018-07-03 23:31:26.732659327 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2018-11-01 19:07:09.918025205 +0100
@@ -1,0 +2,19 @@
+Fri Oct 26 13:21:47 UTC 2018 - jreidinger(a)suse.com
+
+- Console: Use empty string instead of none for FONTMAP
+ (bsc#1013573)
+- 4.1.0
+
+-------------------------------------------------------------------
+Thu Sep 27 10:37:48 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Set only system time if no hardware clock available (bsc#1103744)
+- 4.0.24
+
+-------------------------------------------------------------------
+Mon Aug 20 10:11:59 CEST 2018 - schubi(a)suse.de
+
+- Changed dir of COPYING file.
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Old:
----
yast2-country-4.0.23.tar.bz2
New:
----
yast2-country-4.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.SuwTvA/_old 2018-11-01 19:07:11.086025275 +0100
+++ /var/tmp/diff_new_pack.SuwTvA/_new 2018-11-01 19:07:11.086025275 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 4.0.23
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -63,7 +63,7 @@
Requires: rubygem(%{rb_default_ruby_abi}:ruby-dbus)
Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone)
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
%description
@@ -92,7 +92,7 @@
%files
%defattr(-,root,root)
%doc %{yast_docdir}
-%doc COPYING
+%license COPYING
%{yast_moduledir}/Console.rb
%{yast_moduledir}/Keyboard.rb
%{yast_moduledir}/Timezone.rb
@@ -103,6 +103,7 @@
%dir %{yast_libdir}/y2country
%{yast_libdir}/y2country/widgets
%{yast_ydatadir}/*.ycp
+%{yast_ydatadir}/*.json
%{yast_yncludedir}/keyboard/
%{yast_yncludedir}/timezone/
%{yast_scrconfdir}/*.scr
++++++ yast2-country-4.0.23.tar.bz2 -> yast2-country-4.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/console/src/Makefile.am new/yast2-country-4.1.0/console/src/Makefile.am
--- old/yast2-country-4.0.23/console/src/Makefile.am 2018-07-02 16:18:18.000000000 +0200
+++ new/yast2-country-4.1.0/console/src/Makefile.am 2018-10-29 10:49:02.000000000 +0100
@@ -7,7 +7,7 @@
scrconf/sysconfig_console.scr
ydata_DATA = \
- data/consolefonts.ycp
+ data/consolefonts.json
EXTRA_DIST = $(module_DATA) $(scrconf_DATA) $(ydata_DATA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/console/src/data/consolefonts.json new/yast2-country-4.1.0/console/src/data/consolefonts.json
--- old/yast2-country-4.0.23/console/src/data/consolefonts.json 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-country-4.1.0/console/src/data/consolefonts.json 2018-10-29 10:49:02.000000000 +0100
@@ -0,0 +1,200 @@
+{
+ "bg": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "bg_BG": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "bg_BG.UTF-8": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": "(K"
+ },
+ "br": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "ca": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "cs": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "de": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "el": {
+ "font": "iso07u-16.psfu",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "el_GR": {
+ "font": "iso07u-16.psfu",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "el_GR.UTF-8": {
+ "font": "iso07u-16.psfu",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "en": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "es": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "fr": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "gl": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "hu": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "it": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "ja": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "lt": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "nl": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "pl": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "pt": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "ru": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "koi2alt",
+ "magic": "(K"
+ },
+ "ru_RU.KOI8-R": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "koi2alt",
+ "magic": "(K"
+ },
+ "ru_RU.UTF-8": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": "(K"
+ },
+ "sk": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "sr": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "sr_RS.UTF-8": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": "(K"
+ },
+ "sr_RS@latin": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": ""
+ },
+ "tg": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "tg_TJ.UTF-8": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": "(K"
+ },
+ "tr": {
+ "font": "eurlatgr.psfu",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": ""
+ },
+ "uk": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "trivial",
+ "magic": "(K"
+ },
+ "uk_UA.UTF-8": {
+ "font": "UniCyr_8x16.psf",
+ "unicodeMap": "",
+ "screenMap": "",
+ "magic": "(K"
+ }
+}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/console/src/data/consolefonts.ycp new/yast2-country-4.1.0/console/src/data/consolefonts.ycp
--- old/yast2-country-4.0.23/console/src/data/consolefonts.ycp 2018-07-02 16:18:18.000000000 +0200
+++ new/yast2-country-4.1.0/console/src/data/consolefonts.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-/* ------------------------------------------------------------------------------
- * Copyright (c) 2016 SUSE LLC
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of version 2 of the GNU General Public License as published by the
- * Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * ------------------------------------------------------------------------------
- */
-
-/*
- * Maintainer: Thomas Fehr <fehr(a)suse.de>
- *
- * consolefonts map
- */
-
-$[
- // LANG font unicode map screen map, console magic
- "en" : [ "eurlatgr.psfu", "", "none", "" ],
-// The two-letters language is used as a fallback, so additional entries like
-// the ones displayed below are not needed as long as they use the same values.
-// "en_GB@euro" : [ "eurlatgr.psfu", "", "none", "" ],
-// "en_GB" : [ "eurlatgr.psfu", "", "none", "" ],
-// "en_US" : [ "eurlatgr.psfu", "", "none", "" ],
-// "en_US.UTF-8" : [ "eurlatgr.psfu", "", "none", "" ],
-// "en_GB.UTF-8" : [ "eurlatgr.psfu", "", "none", "" ],
- "de" : [ "eurlatgr.psfu", "", "none", "" ],
- "fr" : [ "eurlatgr.psfu", "", "none", "" ],
- "it" : [ "eurlatgr.psfu", "", "none", "" ],
- "es" : [ "eurlatgr.psfu", "", "none", "" ],
- "nl" : [ "eurlatgr.psfu", "", "none", "" ],
- "pt" : [ "eurlatgr.psfu", "", "none", "" ],
- "ca" : [ "eurlatgr.psfu", "", "none", "" ],
- "gl" : [ "eurlatgr.psfu", "", "none", "" ],
- "br" : [ "eurlatgr.psfu", "", "none", "" ],
- "pl" : [ "eurlatgr.psfu", "", "none", "" ],
- "cs" : [ "eurlatgr.psfu", "", "none", "" ],
- "sk" : [ "eurlatgr.psfu", "", "none", "" ],
- "hu" : [ "eurlatgr.psfu", "", "none", "" ],
- "lt" : [ "eurlatgr.psfu", "", "none", "" ],
- "ja" : [ "eurlatgr.psfu", "", "none", "" ],
- "tr" : [ "eurlatgr.psfu", "", "none", "" ],
-
- "el_GR" : [ "iso07u-16.psfu", "", "trivial", "(K" ],
- "el" : [ "iso07u-16.psfu", "", "trivial", "(K" ],
- "el_GR.UTF-8" : [ "iso07u-16.psfu", "", "trivial", "(K" ],
-
- "ru_RU.KOI8-R" : [ "UniCyr_8x16.psf", "", "koi2alt", "(K" ],
- "ru" : [ "UniCyr_8x16.psf", "", "koi2alt", "(K" ],
- "ru_RU.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ],
-
- "sr_RS@latin" : [ "eurlatgr.psfu", "", "trivial", "" ],
- "sr" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
- "sr_RS.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ],
-
- "uk" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
- "uk_UA.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ],
-
- "tg" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
- "tg_TJ.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ],
-
- "bg_BG" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
- "bg" : [ "UniCyr_8x16.psf", "", "trivial", "(K" ],
- "bg_BG.UTF-8" : [ "UniCyr_8x16.psf", "", "none", "(K" ]
- ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/console/src/modules/Console.rb new/yast2-country-4.1.0/console/src/modules/Console.rb
--- old/yast2-country-4.0.23/console/src/modules/Console.rb 2018-07-02 16:18:18.000000000 +0200
+++ new/yast2-country-4.1.0/console/src/modules/Console.rb 2018-10-29 10:49:02.000000000 +0100
@@ -46,6 +46,8 @@
# Klaus Kaempf <kkaempf(a)suse.de>
#
require "yast"
+require "json"
+Yast.import "Directory"
module Yast
class ConsoleClass < Module
@@ -65,7 +67,7 @@
@font = "lat1-16.psfu"
@unicodeMap = ""
- @screenMap = "none"
+ @screenMap = ""
@magic = "(B"
# non-empty if serial console (written /etc/inittab)
@@ -96,10 +98,10 @@
if !consolefont.empty?
@language = lang
- @font = consolefont[0] || ""
- @unicodeMap = consolefont[1] || ""
- @screenMap = consolefont[2] || ""
- @magic = consolefont[3] || ""
+ @font = consolefont["font"]
+ @unicodeMap = consolefont["unicodeMap"]
+ @screenMap = consolefont["screenMap"]
+ @magic = consolefont["magic"]
currentLanguage = WFM.GetLanguage
@@ -250,32 +252,30 @@
# Console fonts map
#
- # The map can be read from two different files:
- #
- # * `consolefonts_ID.ycp` where ID is the distribution identifier (as
- # specified in /etc/os-release). For example, `consolefonts_opensuse.ycp`.
- # * `consolefonts.ycp` as a fallback.
- #
# Associates languages with the following set of properties: font, unicode map,
# screen map and magic initialization.
#
# @example Console fonts format
- # consolefonts #=>
- # "bg"=>["UniCyr_8x16.psf", "", "trivial", "(K"],
- # "bg_BG"=>["UniCyr_8x16.psf", "", "trivial", "(K"],
- # "bg_BG.UTF-8"=>["UniCyr_8x16.psf", "", "none", "(K"],
- # "br"=>["lat1-16.psfu", "", "none", "(B"],
- # ...
+ # {
+ # "bg" => {
+ # "font"=>"UniCyr_8x16.psf",
+ # "unicodeMap"=>"",
+ # "screenMap"=>"trivial",
+ # "magic"=>"(K"
+ # },
+ # "bg_BG" => {
+ # "font"=>"UniCyr_8x16.psf",
+ # "unicodeMap"=>"",
+ # "screenMap"=>"trivial",
+ # "magic"=>"(K"
+ # }
+ # }
#
# @return [Hash] Console fonts map. See the example for content details.
def consolefonts
return @consolefonts if @consolefonts
- # Read the file for this product
- @consolefonts = WFM.Read(path(".local.yast2"), "consolefonts_#{OSRelease.id}.ycp")
-
- # Fallback
- @consolefonts ||= WFM.Read(path(".local.yast2"), "consolefonts.ycp")
+ @consolefonts = JSON.load(File.read(Directory.find_data_file("consolefonts.json")))
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/console/test/console_test.rb new/yast2-country-4.1.0/console/test/console_test.rb
--- old/yast2-country-4.0.23/console/test/console_test.rb 2018-07-02 16:18:18.000000000 +0200
+++ new/yast2-country-4.1.0/console/test/console_test.rb 2018-10-29 10:49:02.000000000 +0100
@@ -26,7 +26,7 @@
it "sets console fonts for the given language" do
expect(Yast::UI).to receive(:SetConsoleFont)
- .with("", "eurlatgr.psfu", "none", "", "es_ES")
+ .with("", "eurlatgr.psfu", "", "", "es_ES")
Yast::Console.SelectFont(language)
end
@@ -50,7 +50,7 @@
it "sets console fonts for the given language" do
expect(Yast::UI).to receive(:SetConsoleFont)
- .with("", "eurlatgr.psfu", "none", "", "es_ES")
+ .with("", "eurlatgr.psfu", "", "", "es_ES")
Yast::Console.SelectFont(language)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/package/yast2-country.changes new/yast2-country-4.1.0/package/yast2-country.changes
--- old/yast2-country-4.0.23/package/yast2-country.changes 2018-07-02 16:18:18.000000000 +0200
+++ new/yast2-country-4.1.0/package/yast2-country.changes 2018-10-29 10:49:02.000000000 +0100
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Fri Oct 26 13:21:47 UTC 2018 - jreidinger(a)suse.com
+
+- Console: Use empty string instead of none for FONTMAP
+ (bsc#1013573)
+- 4.1.0
+
+-------------------------------------------------------------------
+Thu Sep 27 10:37:48 UTC 2018 - Stefan Hundhammer <shundhammer(a)suse.com>
+
+- Set only system time if no hardware clock available (bsc#1103744)
+- 4.0.24
+
+-------------------------------------------------------------------
+Mon Aug 20 10:11:59 CEST 2018 - schubi(a)suse.de
+
+- Changed dir of COPYING file.
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
Wed Jun 27 15:16:47 CEST 2018 - schubi(a)suse.de
- Added additional searchkeys to desktop file (fate#321043).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/package/yast2-country.spec new/yast2-country-4.1.0/package/yast2-country.spec
--- old/yast2-country-4.0.23/package/yast2-country.spec 2018-07-02 16:18:18.000000000 +0200
+++ new/yast2-country-4.1.0/package/yast2-country.spec 2018-10-29 10:49:02.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 4.0.23
+Version: 4.1.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -63,7 +63,7 @@
Requires: rubygem(%{rb_default_ruby_abi}:ruby-dbus)
Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone)
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/YaST
%description
@@ -92,7 +92,7 @@
%files
%defattr(-,root,root)
%doc %{yast_docdir}
-%doc COPYING
+%license COPYING
%{yast_moduledir}/Console.rb
%{yast_moduledir}/Keyboard.rb
%{yast_moduledir}/Timezone.rb
@@ -103,6 +103,7 @@
%dir %{yast_libdir}/y2country
%{yast_libdir}/y2country/widgets
%{yast_ydatadir}/*.ycp
+%{yast_ydatadir}/*.json
%{yast_yncludedir}/keyboard/
%{yast_yncludedir}/timezone/
%{yast_scrconfdir}/*.scr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-4.0.23/timezone/src/modules/Timezone.rb new/yast2-country-4.1.0/timezone/src/modules/Timezone.rb
--- old/yast2-country-4.0.23/timezone/src/modules/Timezone.rb 2018-07-02 16:18:18.000000000 +0200
+++ new/yast2-country-4.1.0/timezone/src/modules/Timezone.rb 2018-10-29 10:49:02.000000000 +0100
@@ -474,53 +474,72 @@
# Set the new time and date given by user
def SetTime(year, month, day, hour, minute, second)
- if !Arch.s390
- date = Builtins.sformat(
- " --date=\"%1/%2/%3 %4:%5:%6\" ",
- month,
- day,
- year,
- hour,
- minute,
- second
- )
- cmd = ""
- if Ops.greater_than(Builtins.size(@timezone), 0) &&
- @hwclock != "--localtime"
- cmd = Ops.add(Ops.add("TZ=", @timezone), " ")
- end
- cmd = Ops.add(
- Ops.add(Ops.add(cmd, "/sbin/hwclock --set "), @hwclock),
- date
- )
- Builtins.y2milestone("SetTime cmd %1", cmd)
- SCR.Execute(path(".target.bash"), cmd)
- cmd = Ops.add("/sbin/hwclock --hctosys ", @hwclock)
- Builtins.y2milestone("SetTime cmd %1", cmd)
- SCR.Execute(path(".target.bash"), cmd)
- # actually, it was probably not called, but do not let it change the time again after manual change
- @systz_called = true
- end
+ return nil if Arch.s390
+
+ timedate = "#{month}/#{day}/#{year} #{hour}:#{minute}:#{second}"
+ if set_hwclock(timedate)
+ sync_hwclock_to_system_time
+ else
+ # No hardware clock available (bsc#1103744)
+ log.info("Fallback: Leaving HW clock untouched, setting only system time")
+ set_system_time(timedate)
+ end
nil
end
# Set the Hardware Clock to the current System Time.
def SystemTime2HWClock
- if !Arch.s390
- cmd = ""
- if Ops.greater_than(Builtins.size(@timezone), 0) &&
- @hwclock != "--localtime"
- cmd = Ops.add(Ops.add("TZ=", @timezone), " ")
- end
- cmd = Ops.add("/sbin/hwclock --systohc ", @hwclock)
- Builtins.y2milestone("cmd %1", cmd)
- SCR.Execute(path(".target.bash"), cmd)
- end
+ return nil if Arch.s390
+ cmd = tz_prefix + "/sbin/hwclock --systohc #{@hwclock}"
+ log.info("cmd #{cmd}")
+ SCR.Execute(path(".target.bash"), cmd)
nil
end
+ # Set the hardware clock with the given date.
+ # @param timedate [String]
+ # @return [Bool] true if success, false if error
+ #
+ def set_hwclock(date)
+ cmd = tz_prefix + "/sbin/hwclock --set #{@hwclock} --date=\"#{date}\""
+ log.info("set_hwclock: #{cmd}")
+ SCR.Execute(path(".target.bash"), cmd) == 0
+ end
+
+ # Synchronize the hardware clock to the system time
+ #
+ def sync_hwclock_to_system_time
+ cmd = "/sbin/hwclock --hctosys #{@hwclock}"
+ log.info("sync_hwclock_to_system_time: #{cmd}")
+ SCR.Execute(path(".target.bash"), cmd)
+ @systz_called = true
+ end
+
+ # Set only the system time (leaving the hardware clock untouched)
+ # @param timedate [String]
+ #
+ def set_system_time(timedate)
+ cmd = tz_prefix + "/usr/bin/date --set=\"#{timedate}\""
+ log.info("set_system_time: #{cmd}")
+ SCR.Execute(path(".target.bash"), cmd)
+ end
+
+ # Return a "TZ=... " prefix for commands such as "hwclock" or "date" to set
+ # the time zone environment variable temporarily for the duration of one
+ # command.
+ #
+ # If nonempty, this will append a blank as a separator.
+ #
+ # @return [String]
+ #
+ def tz_prefix
+ return "" if @hwclock == "--localtime"
+ return "" if @timezone.empty?
+ "TZ=#{@timezone} "
+ end
+
# GetTimezoneForLanguage()
#
@@ -615,11 +634,7 @@
"+%c" :
"+%Y-%m-%d - %H:%M:%S"
- Builtins.y2milestone(
- "GetDateTime hwclock %1 real:%2",
- @hwclock,
- real_time
- )
+ log.info("GetDateTime hwclock: #{@hwclock} real: #{real_time}")
if !real_time && !Mode.config
ds = 0
if @diff != 0
@@ -627,7 +642,7 @@
SCR.Execute(path(".target.bash_output"), "date +%z")
)
tzd = Ops.get_string(out2, "stdout", "")
- Builtins.y2milestone("GetDateTime tcd=%1", tzd)
+ log.info("GetDateTime tzd: #{tzd}")
t = Builtins.tointeger(String.CutZeros(Builtins.substring(tzd, 1, 2)))
if t != nil
ds = Ops.add(ds, Ops.multiply(t, 3600))
@@ -636,27 +651,23 @@
)
ds = Ops.add(ds, Ops.multiply(t, 60))
ds = Ops.unary_minus(ds) if Builtins.substring(tzd, 0, 1) == "-"
- Builtins.y2milestone("GetDateTime ds %1 diff %2", ds, @diff)
+ log.info("GetDateTime ds: #{ds} diff: #{@diff}")
end
end
- cmd = ""
- cmd = Builtins.sformat("TZ=%1 ", @timezone) if @hwclock != "--localtime"
- cmd = Ops.add(
- cmd,
+ cmd = tz_prefix +
Builtins.sformat(
"/bin/date \"%1\" \"--date=now %2sec\"",
date_format,
Ops.multiply(ds, @diff)
)
- )
else
cmd = Builtins.sformat("/bin/date \"%1\"", date_format)
end
- Builtins.y2milestone("GetDateTime cmd=%1", cmd)
+ log.info("GetDateTime cmd: #{cmd}")
out = Convert.to_map(SCR.Execute(path(".target.bash_output"), cmd))
local_date = Builtins.deletechars(Ops.get_string(out, "stdout", ""), "\n")
- Builtins.y2milestone("GetDateTime local_date='%1'", local_date)
+ log.info("GetDateTime local_date: '#{local_date}'")
local_date
end
1
0
Hello community,
here is the log from the commit of package skelcd-control-Kubic for openSUSE:Factory checked in at 2018-11-01 19:06:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-Kubic (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-Kubic.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-Kubic"
Thu Nov 1 19:06:31 2018 rev:19 rq:645177 version:15.1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/skelcd-control-Kubic/skelcd-control-Kubic.changes 2018-09-13 12:09:51.538405776 +0200
+++ /work/SRC/openSUSE:Factory/.skelcd-control-Kubic.new/skelcd-control-Kubic.changes 2018-11-01 19:06:33.662022995 +0100
@@ -1,0 +2,9 @@
+Fri Oct 26 15:36:28 UTC 2018 - lslezak(a)suse.cz
+
+- Display a new dialog when selecting the Kubeadm role
+ (FATE#325834)
+- Removed the SLE/CaaSP handling, this is just an openSUSE package
+- Use %license for the license file
+- 15.1.7
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-Kubic-15.1.6.tar.bz2
New:
----
skelcd-control-Kubic-15.1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-Kubic.spec ++++++
--- /var/tmp/diff_new_pack.bPMuPL/_old 2018-11-01 19:06:34.126023024 +0100
+++ /var/tmp/diff_new_pack.bPMuPL/_new 2018-11-01 19:06:34.130023024 +0100
@@ -33,13 +33,11 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 4.0.10
-%if 0%{?is_opensuse}
# xsltproc - for building control.TWKubic.xml from control.Kubic.xml
BuildRequires: diffutils
BuildRequires: libxslt-tools
# we need to copy some parts from the openSUSE control.xml to Kubic
BuildRequires: skelcd-control-openSUSE
-%endif
######################################################################
#
@@ -47,15 +45,13 @@
# installation system (inst-sys) for the Yast installer
#
-# SLES specific Yast packages needed in the inst-sys
+# Kubic specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
+Requires: yast2-caasp >= 4.1.1
-%if 0%{?is_susecaasp}
-Requires: yast2-theme-SLE
-%else
+# branding
Requires: yast2-branding-openSUSE
Requires: yast2-qt-branding-openSUSE
-%endif
# Generic Yast packages needed for the installer
Requires: autoyast2
@@ -92,6 +88,23 @@
Conflicts: product_control
Provides: product_control
+# we really do not need the YaST packages for building, ignore the dependencies
+# to have faster builds and less rebuilds triggered by dependencies
+# these are pulled in by the skelcd-control-openSUSE dependencies
+#!BuildIgnore: yast2-caasp yast2-branding-openSUSE yast2-qt-branding-openSUSE
+#!BuildIgnore: autoyast2 yast2-add-on yast2-buildtools yast2-devtools
+#!BuildIgnore: yast2-fcoe-client yast2-firewall
+#!BuildIgnore: yast2-installation yast2-iscsi-client yast2-kdump yast2-multipath
+#!BuildIgnore: yast2-network yast2-nfs-client yast2-ntp-client yast2-proxy
+#!BuildIgnore: yast2-services-manager yast2-slp yast2-trans-stats yast2-tune
+#!BuildIgnore: yast2-update yast2-users yast2-x11 yast2-rdp
+#!BuildIgnore: yast2-reipl yast2-s390 yast2-vm
+#!BuildIgnore: rubygem(%{rb_default_ruby_abi}:byebug)
+#!BuildIgnore: yast2-branding-openSUSE-Oxygen yast2-configuration-management
+#!BuildIgnore: yast2-core yast2-hardware-detection yast2-installation-control
+#!BuildIgnore: yast2-logs yast2-perl-bindings yast2-pkg-bindings yast2-ruby-bindings
+#!BuildIgnore: yast2 yast2-ycp-ui-bindings
+
# Architecture specific packages
#
%ifarch s390 s390x
@@ -108,7 +121,7 @@
Url: https://github.com/yast/skelcd-control-Kubic
AutoReqProv: off
-Version: 15.1.6
+Version: 15.1.7
Release: 0
Summary: The Kubic control file needed for installation
License: MIT
@@ -127,14 +140,12 @@
%setup -n %{name}-%{version}
-%if 0%{?is_opensuse}
%build
# build control.TWKubic.xml from control.Kubic.xml
make -C control control.TWKubic.xml
# display the changes (just for easier debugging)
# don't fail, a difference is expected
diff -u control/control.Kubic.xml control/control.TWKubic.xml || :
-%endif
%check
#
@@ -147,13 +158,7 @@
# Add control file
#
mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
-%if 0%{?is_susecaasp}
-install -m 644 control/control.CAASP.xml $RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%else
-%if 0%{?is_opensuse}
install -m 644 control/control.TWKubic.xml $RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%endif
-%endif
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -161,14 +166,12 @@
%files
%defattr(644,root,root,755)
-%if 0%{?is_susecaasp}%{?is_opensuse}
%if %{defined skelcdpath}
%dir %{skelcdpath}
%endif
%dir %{?skelcdpath}/CD1
%{?skelcdpath}/CD1/control.xml
-%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
-%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
+%license %{_prefix}/share/doc/packages/%{name}/LICENSE
%changelog
++++++ skelcd-control-Kubic-15.1.6.tar.bz2 -> skelcd-control-Kubic-15.1.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/.travis.sh new/skelcd-control-Kubic-15.1.7/.travis.sh
--- old/skelcd-control-Kubic-15.1.6/.travis.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/skelcd-control-Kubic-15.1.7/.travis.sh 2018-10-29 08:38:03.000000000 +0100
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+set -e -x
+
+make -C control check
+
+# the "yast-travis-ruby" script is included in the base yastdevel/ruby image
+# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
+yast-travis-ruby
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/.travis.yml new/skelcd-control-Kubic-15.1.7/.travis.yml
--- old/skelcd-control-Kubic-15.1.6/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/skelcd-control-Kubic-15.1.7/.travis.yml 2018-10-29 08:38:03.000000000 +0100
@@ -0,0 +1,9 @@
+sudo: required
+language: bash
+services:
+ - docker
+
+before_install:
+ - docker build -t yast-skelcd-control-kubic-image .
+script:
+ - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-skelcd-control-kubic-image ./.travis.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/README.md new/skelcd-control-Kubic-15.1.7/README.md
--- old/skelcd-control-Kubic-15.1.6/README.md 2018-09-06 14:43:34.000000000 +0200
+++ new/skelcd-control-Kubic-15.1.7/README.md 2018-10-29 08:38:03.000000000 +0100
@@ -1,7 +1,7 @@
skelcd-control-Kubic
===================
-[![Travis Build](https://travis-ci.org/yast/skelcd-control-Kubic.svg?branch=master)](…
+[![Travis Build](https://travis-ci.org/yast/skelcd-control-Kubic.svg?branch=master)](…
Installation control file for openSUSE Kubic
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/control/control.Kubic.xml new/skelcd-control-Kubic-15.1.7/control/control.Kubic.xml
--- old/skelcd-control-Kubic-15.1.6/control/control.Kubic.xml 2018-09-06 14:43:34.000000000 +0200
+++ new/skelcd-control-Kubic-15.1.7/control/control.Kubic.xml 2018-10-29 08:38:03.000000000 +0100
@@ -250,6 +250,7 @@
</software>
<order config:type="integer">200</order>
+ <additional_dialogs>inst_kubic_kubeadm_role</additional_dialogs>
</system_role>
<system_role>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.changes new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.changes
--- old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.changes 2018-09-06 14:43:34.000000000 +0200
+++ new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.changes 2018-10-29 08:38:03.000000000 +0100
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Fri Oct 26 15:36:28 UTC 2018 - lslezak(a)suse.cz
+
+- Display a new dialog when selecting the Kubeadm role
+ (FATE#325834)
+- Removed the SLE/CaaSP handling, this is just an openSUSE package
+- Use %license for the license file
+- 15.1.7
+
+-------------------------------------------------------------------
Tue Aug 21 15:32:55 UTC 2018 - rbrown(a)suse.com
- Run partition proposal before bootloader proposal (boo#1099762)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.spec new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.spec
--- old/skelcd-control-Kubic-15.1.6/package/skelcd-control-Kubic.spec 2018-09-06 14:43:34.000000000 +0200
+++ new/skelcd-control-Kubic-15.1.7/package/skelcd-control-Kubic.spec 2018-10-29 08:38:03.000000000 +0100
@@ -33,13 +33,11 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 4.0.10
-%if 0%{?is_opensuse}
# xsltproc - for building control.TWKubic.xml from control.Kubic.xml
BuildRequires: libxslt-tools
BuildRequires: diffutils
# we need to copy some parts from the openSUSE control.xml to Kubic
BuildRequires: skelcd-control-openSUSE
-%endif
######################################################################
#
@@ -47,15 +45,13 @@
# installation system (inst-sys) for the Yast installer
#
-# SLES specific Yast packages needed in the inst-sys
+# Kubic specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
+Requires: yast2-caasp >= 4.1.1
-%if 0%{?is_susecaasp}
-Requires: yast2-theme-SLE
-%else
+# branding
Requires: yast2-branding-openSUSE
Requires: yast2-qt-branding-openSUSE
-%endif
# Generic Yast packages needed for the installer
Requires: autoyast2
@@ -92,6 +88,23 @@
Conflicts: product_control
Provides: product_control
+# we really do not need the YaST packages for building, ignore the dependencies
+# to have faster builds and less rebuilds triggered by dependencies
+# these are pulled in by the skelcd-control-openSUSE dependencies
+#!BuildIgnore: yast2-caasp yast2-branding-openSUSE yast2-qt-branding-openSUSE
+#!BuildIgnore: autoyast2 yast2-add-on yast2-buildtools yast2-devtools
+#!BuildIgnore: yast2-fcoe-client yast2-firewall
+#!BuildIgnore: yast2-installation yast2-iscsi-client yast2-kdump yast2-multipath
+#!BuildIgnore: yast2-network yast2-nfs-client yast2-ntp-client yast2-proxy
+#!BuildIgnore: yast2-services-manager yast2-slp yast2-trans-stats yast2-tune
+#!BuildIgnore: yast2-update yast2-users yast2-x11 yast2-rdp
+#!BuildIgnore: yast2-reipl yast2-s390 yast2-vm
+#!BuildIgnore: rubygem(%{rb_default_ruby_abi}:byebug)
+#!BuildIgnore: yast2-branding-openSUSE-Oxygen yast2-configuration-management
+#!BuildIgnore: yast2-core yast2-hardware-detection yast2-installation-control
+#!BuildIgnore: yast2-logs yast2-perl-bindings yast2-pkg-bindings yast2-ruby-bindings
+#!BuildIgnore: yast2 yast2-ycp-ui-bindings
+
# Architecture specific packages
#
%ifarch s390 s390x
@@ -108,7 +121,7 @@
Url: https://github.com/yast/skelcd-control-Kubic
AutoReqProv: off
-Version: 15.1.6
+Version: 15.1.7
Release: 0
Summary: The Kubic control file needed for installation
License: MIT
@@ -127,14 +140,12 @@
%setup -n %{name}-%{version}
-%if 0%{?is_opensuse}
%build
# build control.TWKubic.xml from control.Kubic.xml
make -C control control.TWKubic.xml
# display the changes (just for easier debugging)
# don't fail, a difference is expected
diff -u control/control.Kubic.xml control/control.TWKubic.xml || :
-%endif
%check
#
@@ -147,14 +158,7 @@
# Add control file
#
mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
-%if 0%{?is_susecaasp}
-install -m 644 control/control.CAASP.xml $RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%else
-%if 0%{?is_opensuse}
install -m 644 control/control.TWKubic.xml $RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%endif
-%endif
-
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -162,14 +166,12 @@
%files
%defattr(644,root,root,755)
-%if 0%{?is_susecaasp}%{?is_opensuse}
%if %{defined skelcdpath}
%dir %{skelcdpath}
%endif
%dir %{?skelcdpath}/CD1
%{?skelcdpath}/CD1/control.xml
-%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
-%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
+%license %{_prefix}/share/doc/packages/%{name}/LICENSE
%changelog
1
0