Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2018-07-03 23:33:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-client" Tue Jul 3 23:33:22 2018 rev:74 rq:620299 version:4.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2018-05-19 15:38:44.686797217 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes 2018-07-03 23:33:24.600489795 +0200 @@ -1,0 +2,6 @@ +Wed Jun 27 17:30:25 CEST 2018 - [email protected] + +- Added additional searchkeys to desktop file (fate#321043). +- 4.0.7 + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-4.0.6.tar.bz2 New: ---- yast2-nfs-client-4.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.L966ck/_old 2018-07-03 23:33:25.016489197 +0200 +++ /var/tmp/diff_new_pack.L966ck/_new 2018-07-03 23:33:25.016489197 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 4.0.6 +Version: 4.0.7 Release: 0 Url: https://github.com/yast/yast-nfs-client ++++++ yast2-nfs-client-4.0.6.tar.bz2 -> yast2-nfs-client-4.0.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.6/package/yast2-nfs-client.changes new/yast2-nfs-client-4.0.7/package/yast2-nfs-client.changes --- old/yast2-nfs-client-4.0.6/package/yast2-nfs-client.changes 2018-05-18 18:39:50.000000000 +0200 +++ new/yast2-nfs-client-4.0.7/package/yast2-nfs-client.changes 2018-07-02 18:08:53.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 27 17:30:25 CEST 2018 - [email protected] + +- Added additional searchkeys to desktop file (fate#321043). +- 4.0.7 + +------------------------------------------------------------------- Fri May 18 14:28:05 UTC 2018 - [email protected] - Fixed a bug preventing some strings (introduced while fixing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.6/package/yast2-nfs-client.spec new/yast2-nfs-client-4.0.7/package/yast2-nfs-client.spec --- old/yast2-nfs-client-4.0.6/package/yast2-nfs-client.spec 2018-05-18 18:39:50.000000000 +0200 +++ new/yast2-nfs-client-4.0.7/package/yast2-nfs-client.spec 2018-07-02 18:08:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 4.0.6 +Version: 4.0.7 Release: 0 Url: https://github.com/yast/yast-nfs-client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.6/src/desktop/nfs.desktop new/yast2-nfs-client-4.0.7/src/desktop/nfs.desktop --- old/yast2-nfs-client-4.0.6/src/desktop/nfs.desktop 2018-05-18 18:39:50.000000000 +0200 +++ new/yast2-nfs-client-4.0.7/src/desktop/nfs.desktop 2018-07-02 18:08:53.000000000 +0200 @@ -17,6 +17,7 @@ X-SuSE-YaST-AutoInstClonable=true X-SuSE-YaST-AutoInstRequires=lan X-SuSE-YaST-AutoInstSchema=nfs.rnc +X-SuSE-YaST-Keywords=network,file,directory,share Icon=yast-nfs Exec=xdg-su -c "/sbin/yast2 nfs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.6/src/modules/Nfs.rb new/yast2-nfs-client-4.0.7/src/modules/Nfs.rb --- old/yast2-nfs-client-4.0.6/src/modules/Nfs.rb 2018-05-18 18:39:50.000000000 +0200 +++ new/yast2-nfs-client-4.0.7/src/modules/Nfs.rb 2018-07-02 18:08:53.000000000 +0200 @@ -243,63 +243,6 @@ deep_copy(settings) end - # ------------------------------------------------------------ - # Space escaping. - # This should be done by the agent, but any-agent sucks. - - # Escape spaces " " -> "\\040". - # @param [String] s a string or nil - # @return escaped string or nil - def EscapeSpaces1(s) - return nil if s.nil? - s.gsub(/ /) { "\\040" } # block prevents interpreting \ as backreference - end - - # Escape spaces " " -> "\\040" in all values of all entries - # @param [Array<Hash{String => Object>}] entries a list of maps, such as nfs_entries - # @return escaped entries - def EscapeSpaces(entries) - entries = deep_copy(entries) - Builtins.maplist(entries) do |entry| - Builtins.mapmap(entry) do |key, value| - { - key => if Ops.is_string?(value) - EscapeSpaces1(Convert.to_string(value)) - else - value - end - } - end - end - end - - # Un-escape spaces "\\040" -> " " - # @param [String] s string or nil - # @return escaped string or nil - def UnescapeSpaces1(s) - return nil if s.nil? - # escaped space, \040, is /\\040/ - s.gsub(/\\040/, " ") - end - - # Un-escape spaces "\\040" -> " " in all values of all entries - # @param [Array<Hash{String => Object>}] entries a list of maps, such as nfs_entries - # @return escaped entries - def UnescapeSpaces(entries) - entries = deep_copy(entries) - Builtins.maplist(entries) do |entry| - Builtins.mapmap(entry) do |key, value| - { - key => if Ops.is_string?(value) - UnescapeSpaces1(Convert.to_string(value)) - else - value - end - } - end - end - end - def FindPortmapper # testsuite is dumb - it can't distinguish between the existence # of two services - either both exists or both do not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.0.6/test/routines_test.rb new/yast2-nfs-client-4.0.7/test/routines_test.rb --- old/yast2-nfs-client-4.0.6/test/routines_test.rb 2018-05-18 18:39:50.000000000 +0200 +++ new/yast2-nfs-client-4.0.7/test/routines_test.rb 2018-07-02 18:08:53.000000000 +0200 @@ -49,23 +49,83 @@ end describe "#SpecToServPath" do - # FIXME: separate in individual tests - it "returns a couple term with the server and the exported path params" do - term = subject.SpecToServPath("big.foo.com:/share/data") - expect(term.value).to eql(:couple) - expect(term.params).to eql(["big.foo.com", "/share/data"]) - term = subject.SpecToServPath("big.foo.com:") - expect(term.params).to eql(["big.foo.com", ""]) - term = subject.SpecToServPath("big.foo.com") - expect(term.params).to eql(["", "big.foo.com"]) - term = subject.SpecToServPath(":/only/path") - expect(term.params).to eql(["", "/only/path"]) - term = subject.SpecToServPath("/nocolon/only/path") - expect(term.params).to eql(["", "/nocolon/only/path"]) - term = subject.SpecToServPath("fe80::219:d1ff:feac:fd10:/path") - expect(term.params).to eql(["fe80::219:d1ff:feac:fd10", "/path"]) - term = subject.SpecToServPath("") - expect(term.params).to eql(["", ""]) + let(:term) { subject.SpecToServPath(spec) } + + RSpec.shared_examples "couple term" do + it "returns a :couple term" do + expect(term).to be_a Yast::Term + expect(term.value).to eql(:couple) + end + end + + context "for a spec with url and path separated by colon" do + let(:spec) { "big.foo.com:/share/data" } + + include_examples "couple term" + + it "returns a term in which the params are the url and the path" do + expect(term.params).to eql ["big.foo.com", "/share/data"] + end + end + + context "for a spec with url followed by a colon but no path" do + let(:spec) { "big.foo.com:" } + + include_examples "couple term" + + it "returns a term in which the params are the url and an empty string" do + expect(term.params).to eql ["big.foo.com", ""] + end + end + + context "for a spec with a string that looks like an url and no colon" do + let(:spec) { "big.foo.com" } + + include_examples "couple term" + + it "returns a term in which the params are an empty string and the full spec" do + expect(term.params).to eql ["", "big.foo.com"] + end + end + + context "for a spec with a string that looks like a path and no colon" do + let(:spec) { "/nocolon/only/path" } + + include_examples "couple term" + + it "returns a term in which the params are an empty string and the full spec" do + expect(term.params).to eql ["", "/nocolon/only/path"] + end + end + + context "for a spec containing only a colon followed by a path" do + let(:spec) { ":/only/path" } + + include_examples "couple term" + + it "returns a term in which the params are an empty string and the path" do + expect(term.params).to eql ["", "/only/path"] + end + end + + context "for a spec containing an IPv6 address (several colons) followed by a colon and a path" do + let(:spec) { "fe80::219:d1ff:feac:fd10:/path" } + + include_examples "couple term" + + it "returns a term in which the params are the IP address (including all its colons) and the path" do + expect(term.params).to eql ["fe80::219:d1ff:feac:fd10", "/path"] + end + end + + context "for an empty spec" do + let(:spec) { "" } + + include_examples "couple term" + + it "returns a term in which the params are two empty strings" do + expect(term.params).to eql ["", ""] + end end end
