Merge 181a6e6 into 148bd49

yast · Jun 19, 2020 · 1a03e69 · 1a03e69
2 parents 148bd49 + 181a6e6
commit 1a03e69
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 19 13:04:18 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Parse correctly udev rules keys using underscores (bsc#1167256)
+- 4.2.71
+
 -------------------------------------------------------------------
 Mon Jun 15 11:53:03 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.2.70
+Version:        4.2.71
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/y2network/udev_rule_part.rb b/src/lib/y2network/udev_rule_part.rb
@@ -27,7 +27,7 @@ module Y2Network
   class UdevRulePart
     include Yast::Logger
     # Regular expression to match a udev rule part
-    PART_REGEXP = Regexp.new("\\A(?<key>[A-Za-z\{\}]+)(?<operator>[^\"]+)\"(?<value>.+)\"\\Z")
+    PART_REGEXP = Regexp.new("\\A(?<key>[A-Za-z\{\}_]+)(?<operator>[^\"]+)\"(?<value>.+)\"\\Z")
 
     class << self
       # Returns a rule part from a string

diff --git a/test/y2network/udev_rule_part_test.rb b/test/y2network/udev_rule_part_test.rb
@@ -33,6 +33,11 @@
       expect(part.key).to eq("ACTION")
       expect(part.operator).to eq("==")
       expect(part.value).to eq("add")
+
+      part = described_class.from_string("ATTR{dev_id}==\"0x0\"")
+      expect(part.key).to eq("ATTR{dev_id}")
+      expect(part.operator).to eq("==")
+      expect(part.value).to eq("0x0")
     end
 
     it "returns nil in case of an invalid udev rule" do