Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2015-07-20 15:13:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2015-07-05 17:52:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2015-07-20 15:13:44.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 14 15:46:32 UTC 2015 - [email protected] + +- fixed crash when editing the default URL of a new addon + (bsc#937948) +- 3.1.75 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.74.tar.bz2 New: ---- yast2-packager-3.1.75.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.2RHmAP/_old 2015-07-20 15:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.2RHmAP/_new 2015-07-20 15:13:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.74 +Version: 3.1.75 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.74.tar.bz2 -> yast2-packager-3.1.75.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.74/package/yast2-packager.changes new/yast2-packager-3.1.75/package/yast2-packager.changes --- old/yast2-packager-3.1.74/package/yast2-packager.changes 2015-07-01 13:03:37.000000000 +0200 +++ new/yast2-packager-3.1.75/package/yast2-packager.changes 2015-07-15 15:03:41.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 14 15:46:32 UTC 2015 - [email protected] + +- fixed crash when editing the default URL of a new addon + (bsc#937948) +- 3.1.75 + +------------------------------------------------------------------- Tue Jun 30 14:16:41 UTC 2015 - [email protected] - Do not offer to install recommended packages for already diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.74/package/yast2-packager.spec new/yast2-packager-3.1.75/package/yast2-packager.spec --- old/yast2-packager-3.1.74/package/yast2-packager.spec 2015-07-01 13:03:37.000000000 +0200 +++ new/yast2-packager-3.1.75/package/yast2-packager.spec 2015-07-15 15:03:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.74 +Version: 3.1.75 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.74/src/modules/SourceDialogs.rb new/yast2-packager-3.1.75/src/modules/SourceDialogs.rb --- old/yast2-packager-3.1.74/src/modules/SourceDialogs.rb 2015-07-01 13:03:37.000000000 +0200 +++ new/yast2-packager-3.1.75/src/modules/SourceDialogs.rb 2015-07-15 15:03:42.000000000 +0200 @@ -351,7 +351,12 @@ # @param [String] url string URL to check # @return [Boolean] true if URL is an ISO URL, false otherwise def IsISOURL(url) - uri = URI(url) + begin + uri = URI(url) + rescue URI::InvalidURIError + return false + end + return false if uri.scheme.nil? # empty or generic uri have nil scheme causing exception below (bnc#934216) params = URI.decode_www_form(uri.query || "").to_h @@ -365,7 +370,7 @@ def PreprocessISOURL(url) log.info "Preprocessing ISO URL: #{URL.HidePassword(url)}" - uri = URI(url) + uri = (url == "iso://") ? URI("iso:/") : URI(url) query = uri.query || "" params = URI.decode_www_form(query).to_h @@ -809,9 +814,9 @@ # preserve other URL options, e.g. ?devices=/dev/sr0 # change the URL only when necessary if device == :cd && scheme != "cd" - @_url = "cd:///" + @_url = "cd://" elsif device == :dvd && scheme != "dvd" - @_url = "dvd:///" + @_url = "dvd://" end nil @@ -2262,7 +2267,7 @@ elsif selected == :nfs @_url = "nfs://" elsif selected == :cd || selected == :dvd - @_url = selected == :cd ? "cd:///" : "dvd:///" + @_url = selected == :cd ? "cd://" : "dvd://" if @cd_device_name != "" @_url = Ops.add( Ops.add(@_url, "?devices="), @@ -2276,7 +2281,7 @@ elsif selected == :local_dir @_url = "dir://" elsif selected == :local_iso - @_url = "iso:///" + @_url = "iso://" elsif selected == :slp @_url = "slp://" elsif selected == :comm_repos @@ -2307,9 +2312,9 @@ current = :nfs elsif @_url == "nfs4://" current = :nfs - elsif @_url == "cd:///" + elsif @_url == "cd://" current = :cd - elsif @_url == "dvd:///" + elsif @_url == "dvd://" current = :dvd elsif @_url == "hd://" current = :hd
