Merge pull request #131 from yast/fix_dvd

Fix dvd
yast · Jul 21, 2015 · 10d8472 · 10d8472
2 parents bbdad18 + b5448be
commit 10d8472
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 21 08:32:41 UTC 2015 - jreidinger@suse.com
+
+- fix crash when adding addon on DVD (bnc#938786)
+- 3.1.76
+
 -------------------------------------------------------------------
 Tue Jul 14 15:46:32 UTC 2015 - lslezak@suse.cz
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.1.75
+Version:        3.1.76
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/SourceDialogs.rb b/src/modules/SourceDialogs.rb
@@ -2266,8 +2266,11 @@ def SelectStore(key, event)
           @_url = "smb://"
         elsif selected == :nfs
           @_url = "nfs://"
+        # this case is specific, as it return complete path and not just
+        # prefix as others
         elsif selected == :cd || selected == :dvd
-          @_url = selected == :cd ? "cd://" : "dvd://"
+          # use three slashes as third slash means path
+          @_url = selected == :cd ? "cd:///" : "dvd:///"
           if @cd_device_name != ""
             @_url = Ops.add(
               Ops.add(@_url, "?devices="),

diff --git a/test/source_dialogs_test.rb b/test/source_dialogs_test.rb
@@ -80,4 +80,15 @@
       expect(subject.URLScheme("test")).to eq "url"
     end
   end
+
+  describe ".SelectStore" do
+    it "sets url to full url for DVD and CD selection" do
+      allow(Yast::UI).to receive(:QueryWidget).with(Id(:type), :CurrentButton)
+        .and_return(:dvd)
+
+      described_class.SelectStore(:type, {})
+
+      expect(described_class.instance_variable_get("@_url")).to eq "dvd:///"
+    end
+  end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -8,3 +8,4 @@
 end
 
 require "yast"
+require "yast/rspec"