Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-storage-ng for
openSUSE:Factory checked in at 2022-04-10 19:05:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-storage-ng (Old)
and /work/SRC/openSUSE:Factory/.yast2-storage-ng.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage-ng"
Sun Apr 10 19:05:17 2022 rev:122 rq:967835 version:4.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-storage-ng/yast2-storage-ng.changes
2022-02-11 23:08:28.890784928 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-storage-ng.new.1900/yast2-storage-ng.changes
2022-04-10 19:05:29.170445305 +0200
@@ -1,0 +2,12 @@
+Thu Apr 7 16:29:00 UTC 2022 - Knut Anderssen <[email protected]>
+
+- Fix fstab entry filesystem matching allowing the use of quotes
+ surrounding the device UUID or label (bsc#1197692)
+- 4.5.1
+
+-------------------------------------------------------------------
+Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slez??k <[email protected]>
+
+- Bump version to 4.5.0 (#bsc1198109)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-ng-4.4.36.tar.bz2
New:
----
yast2-storage-ng-4.5.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage-ng.spec ++++++
--- /var/tmp/diff_new_pack.yJAv3a/_old 2022-04-10 19:05:30.426431401 +0200
+++ /var/tmp/diff_new_pack.yJAv3a/_new 2022-04-10 19:05:30.430431357 +0200
@@ -17,7 +17,7 @@
Name: yast2-storage-ng
-Version: 4.4.36
+Version: 4.5.1
Release: 0
Summary: YaST2 - Storage Configuration
License: GPL-2.0-only OR GPL-3.0-only
++++++ yast2-storage-ng-4.4.36.tar.bz2 -> yast2-storage-ng-4.5.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.4.36/.github/pull_request_template.md
new/yast2-storage-ng-4.5.1/.github/pull_request_template.md
--- old/yast2-storage-ng-4.4.36/.github/pull_request_template.md
2022-02-10 14:31:00.000000000 +0100
+++ new/yast2-storage-ng-4.5.1/.github/pull_request_template.md 1970-01-01
01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-
-## Problem
-
-*Short description of the original problem.*
-
-- *Bugzilla link*
-- *openQA link*
-- *Links to other related pull requests*
-
-
-## Solution
-
-*Short description of the fix.*
-
-
-## Testing
-
-- *Added a new unit test*
-- *Tested manually*
-
-
-## Screenshots
-
-*If the fix affects the UI attach some screenshots here.*
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.4.36/package/yast2-storage-ng.changes
new/yast2-storage-ng-4.5.1/package/yast2-storage-ng.changes
--- old/yast2-storage-ng-4.4.36/package/yast2-storage-ng.changes
2022-02-10 14:31:00.000000000 +0100
+++ new/yast2-storage-ng-4.5.1/package/yast2-storage-ng.changes 2022-04-08
15:39:03.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Thu Apr 7 16:29:00 UTC 2022 - Knut Anderssen <[email protected]>
+
+- Fix fstab entry filesystem matching allowing the use of quotes
+ surrounding the device UUID or label (bsc#1197692)
+- 4.5.1
+
+-------------------------------------------------------------------
+Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slez??k <[email protected]>
+
+- Bump version to 4.5.0 (#bsc1198109)
+
+-------------------------------------------------------------------
Thu Feb 10 10:18:23 UTC 2022 - Ancor Gonzalez Sosa <[email protected]>
- Partitioner: 'Add NFS' instead of 'Add Nfs' in the menu (related
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.4.36/package/yast2-storage-ng.spec
new/yast2-storage-ng-4.5.1/package/yast2-storage-ng.spec
--- old/yast2-storage-ng-4.4.36/package/yast2-storage-ng.spec 2022-02-10
14:31:00.000000000 +0100
+++ new/yast2-storage-ng-4.5.1/package/yast2-storage-ng.spec 2022-04-08
15:39:03.000000000 +0200
@@ -16,7 +16,7 @@
#
Name: yast2-storage-ng
-Version: 4.4.36
+Version: 4.5.1
Release: 0
Summary: YaST2 - Storage Configuration
License: GPL-2.0-only OR GPL-3.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.4.36/src/lib/y2storage/filesystems/blk_filesystem.rb
new/yast2-storage-ng-4.5.1/src/lib/y2storage/filesystems/blk_filesystem.rb
--- old/yast2-storage-ng-4.4.36/src/lib/y2storage/filesystems/blk_filesystem.rb
2022-02-10 14:31:00.000000000 +0100
+++ new/yast2-storage-ng-4.5.1/src/lib/y2storage/filesystems/blk_filesystem.rb
2022-04-08 15:39:03.000000000 +0200
@@ -286,12 +286,12 @@
# @see Filesystems::Base#match_fstab_spec?
def match_fstab_spec?(spec)
- if /^UUID=(.*)/ =~ spec
- return !Regexp.last_match(1).empty? && uuid == Regexp.last_match(1)
+ if /^UUID=(['"]?)(.*)\1$/ =~ spec
+ return !Regexp.last_match(2).empty? && uuid == Regexp.last_match(2)
end
- if /^LABEL=(.*)/ =~ spec
- return !Regexp.last_match(1).empty? && label == Regexp.last_match(1)
+ if /^LABEL=(['"]?)(.*)\1$/ =~ spec
+ return !Regexp.last_match(2).empty? && label == Regexp.last_match(2)
end
named_device = devicegraph.find_by_any_name(spec)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-ng-4.4.36/src/lib/y2storage/luks.rb
new/yast2-storage-ng-4.5.1/src/lib/y2storage/luks.rb
--- old/yast2-storage-ng-4.4.36/src/lib/y2storage/luks.rb 2022-02-10
14:31:00.000000000 +0100
+++ new/yast2-storage-ng-4.5.1/src/lib/y2storage/luks.rb 2022-04-08
15:39:03.000000000 +0200
@@ -72,8 +72,8 @@
# @param spec [String] content of the second column of an /etc/crypttab
entry
# @return [Boolean]
def match_crypttab_spec?(spec)
- if /^UUID=(.*)/ =~ spec
- return !Regexp.last_match(1).empty? && uuid == Regexp.last_match(1)
+ if /^UUID=(['"]?)(.*)\1$/ =~ spec
+ return !Regexp.last_match(2).empty? && uuid == Regexp.last_match(2)
end
super
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-storage-ng-4.4.36/test/y2storage/filesystems/blk_filesystem_test.rb
new/yast2-storage-ng-4.5.1/test/y2storage/filesystems/blk_filesystem_test.rb
---
old/yast2-storage-ng-4.4.36/test/y2storage/filesystems/blk_filesystem_test.rb
2022-02-10 14:31:00.000000000 +0100
+++
new/yast2-storage-ng-4.5.1/test/y2storage/filesystems/blk_filesystem_test.rb
2022-04-08 15:39:03.000000000 +0200
@@ -423,6 +423,9 @@
it "returns true for the correct label using LABEL=" do
expect(filesystem.match_fstab_spec?("LABEL=root")).to eq true
+ # labels surrounded by quotes are considered also valid
+ expect(filesystem.match_fstab_spec?("LABEL='root'")).to eq true
+ expect(filesystem.match_fstab_spec?('LABEL="root"')).to eq true
end
it "returns false for the wrong label using LABEL=" do
@@ -437,6 +440,9 @@
it "returns true for the correct UUID using UUID=" do
expect(filesystem.match_fstab_spec?("UUID=4d2e6fde-d105-4f15-b8e1-4173badc8c66")).to
eq true
+ # UUIDs surrounded by quotes are considered also valid
+
expect(filesystem.match_fstab_spec?("UUID='4d2e6fde-d105-4f15-b8e1-4173badc8c66'")).to
eq true
+
expect(filesystem.match_fstab_spec?('UUID="4d2e6fde-d105-4f15-b8e1-4173badc8c66"')).to
eq true
end
it "returns false for the wrong UUID using UUID=" do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-storage-ng-4.4.36/test/y2storage/luks_test.rb
new/yast2-storage-ng-4.5.1/test/y2storage/luks_test.rb
--- old/yast2-storage-ng-4.4.36/test/y2storage/luks_test.rb 2022-02-10
14:31:00.000000000 +0100
+++ new/yast2-storage-ng-4.5.1/test/y2storage/luks_test.rb 2022-04-08
15:39:03.000000000 +0200
@@ -53,6 +53,8 @@
it "returns true for the encryption device UUID when using UUID=" do
expect(subject.match_crypttab_spec?("UUID=#{luks_uuid}")).to eq(true)
+ expect(subject.match_crypttab_spec?("UUID='#{luks_uuid}'")).to eq(true)
+ expect(subject.match_crypttab_spec?("UUID=\"#{luks_uuid}\"")).to eq(true)
end
it "returns false for the kernel name of the encryption device" do
