Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-07-28 06:31:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-15 16:26:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-07-28 06:31:21.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Jul 25 14:35:30 UTC 2014 - [email protected] + +- adjust width of drive selection dialog (bnc#882657) +- 3.1.32 + +------------------------------------------------------------------- +Fri Jul 25 14:17:20 CEST 2014 - [email protected] + +- Do not overwrite the autoyast pattern selection by + the default desktop pattern selection (bnc#888981) +- 3.1.31 + +------------------------------------------------------------------- +Fri Jul 25 09:48:59 UTC 2014 - [email protected] + +- Made SLP browser filter case-insensitive (bnc#869653) + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.30.tar.bz2 New: ---- yast2-packager-3.1.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.661Pkh/_old 2014-07-28 06:31:22.000000000 +0200 +++ /var/tmp/diff_new_pack.661Pkh/_new 2014-07-28 06:31:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.30 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.30.tar.bz2 -> yast2-packager-3.1.32.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.30/package/yast2-packager.changes new/yast2-packager-3.1.32/package/yast2-packager.changes --- old/yast2-packager-3.1.30/package/yast2-packager.changes 2014-07-11 14:34:33.000000000 +0200 +++ new/yast2-packager-3.1.32/package/yast2-packager.changes 2014-07-25 16:44:12.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Fri Jul 25 14:35:30 UTC 2014 - [email protected] + +- adjust width of drive selection dialog (bnc#882657) +- 3.1.32 + +------------------------------------------------------------------- +Fri Jul 25 14:17:20 CEST 2014 - [email protected] + +- Do not overwrite the autoyast pattern selection by + the default desktop pattern selection (bnc#888981) +- 3.1.31 + +------------------------------------------------------------------- +Fri Jul 25 09:48:59 UTC 2014 - [email protected] + +- Made SLP browser filter case-insensitive (bnc#869653) + +------------------------------------------------------------------- Fri Jul 11 12:29:40 UTC 2014 - [email protected] - fixed finding product upgrades (bnc#886621) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.30/package/yast2-packager.spec new/yast2-packager-3.1.32/package/yast2-packager.spec --- old/yast2-packager-3.1.30/package/yast2-packager.spec 2014-07-11 14:34:33.000000000 +0200 +++ new/yast2-packager-3.1.32/package/yast2-packager.spec 2014-07-25 16:44:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.30 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.30/src/modules/DefaultDesktop.rb new/yast2-packager-3.1.32/src/modules/DefaultDesktop.rb --- old/yast2-packager-3.1.30/src/modules/DefaultDesktop.rb 2014-07-11 14:34:33.000000000 +0200 +++ new/yast2-packager-3.1.32/src/modules/DefaultDesktop.rb 2014-07-25 16:44:12.000000000 +0200 @@ -288,11 +288,16 @@ if new_desktop == nil # Reset the selected patterns Builtins.y2milestone("Reseting DefaultDesktop") - PackagesProposal.SetResolvables( - @packages_proposal_ID_patterns, - :pattern, - [] - ) + + # Do not overwrite the autoyast pattern selection by + # the default desktop pattern selection (bnc#888981) + unless Mode.autoinst + PackagesProposal.SetResolvables( + @packages_proposal_ID_patterns, + :pattern, + [] + ) + end elsif !Builtins.haskey(@all_desktops, new_desktop) Builtins.y2error("Attempting to set desktop to unknown %1", new_desktop) else @@ -300,7 +305,9 @@ Builtins.y2milestone("New desktop has been set: %1", @desktop) - if @desktop != nil && @desktop != "" + # Do not overwrite the autoyast pattern selection by + # the default desktop pattern selection (bnc#888981) + if @desktop != nil && @desktop != "" && !Mode.autoinst # Require new patterns and packages PackagesProposal.SetResolvables( @packages_proposal_ID_patterns, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.30/src/modules/SourceManager.rb new/yast2-packager-3.1.32/src/modules/SourceManager.rb --- old/yast2-packager-3.1.30/src/modules/SourceManager.rb 2014-07-11 14:34:33.000000000 +0200 +++ new/yast2-packager-3.1.32/src/modules/SourceManager.rb 2014-07-25 16:44:12.000000000 +0200 @@ -657,27 +657,17 @@ # def AskForCD(message) - cdroms = Convert.convert( - SCR.Read(path(".probe.cdrom")), - :from => "any", - :to => "list <map <string, any>>" - ) - multiple_drives = Ops.greater_than(Builtins.size(cdroms), 1) + cdroms = SCR.Read(path(".probe.cdrom")) + multiple_drives = (cdroms.size > 1) drives_sel = Empty() - devices = Builtins.maplist(cdroms) do |d| - Item( - Id(Ops.get_string(d, "dev_name", "")), - Ops.add( - Ops.add( - Ops.add(Ops.get_string(d, "model", ""), " ("), - Ops.get_string(d, "dev_name", "") - ), - ")" - ) - ) - end if multiple_drives - drives_sel = SelectionBox(Id(:drives), _("&Drive to eject"), devices) + devices = cdroms.map do |d| + Item(Id(d["dev_name"] || ""), "#{d['model']} (#{d['dev_name']})") + end + # To adjust the width of the dialog, look for the more lengthy device label + # (and add some extra space for the frame) + min_width = devices.map {|d| d[1].to_s.size }.max + 4 + drives_sel = MinSize(min_width, 5, SelectionBox(Id(:drives), _("&Drive to eject"), devices)) end contents = HBox( HSpacing(1), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.30/src/modules/SourceManagerSLP.rb new/yast2-packager-3.1.32/src/modules/SourceManagerSLP.rb --- old/yast2-packager-3.1.30/src/modules/SourceManagerSLP.rb 2014-07-11 14:34:33.000000000 +0200 +++ new/yast2-packager-3.1.32/src/modules/SourceManagerSLP.rb 2014-07-25 16:44:12.000000000 +0200 @@ -301,8 +301,8 @@ # # @param [list <map> &] services (reference) # @param string regexp for services that should be visible (nil or "" for all) - def InitSLPListFoundDialog(services, regexp_string) - regexp_string = nil if regexp_string == "" + def InitSLPListFoundDialog(services, filter_string) + filter_string = nil if filter_string == "" inst_products = {} service_label = nil @@ -331,9 +331,9 @@ end end # search works in "label" or in "srvurl" as a fallback - if regexp_string != nil - # filter out all services that don't match the regexp - next if !Builtins.regexpmatch(service_label, regexp_string) + if filter_string != nil + # filter out all services that don't match the filter + next if !service_label.downcase.include?(filter_string.downcase) end # define an empty list if it is not defined at all if Ops.get(inst_products, service_label) == nil @@ -431,27 +431,6 @@ end end - def EscapeChars(input, escape) - ret = input - - if escape != nil && Ops.greater_than(Builtins.size(escape), 0) - i = 0 - sz = Builtins.size(escape) - - while Ops.less_than(i, sz) - ch = Builtins.substring(escape, i, 1) - Builtins.y2debug("Escaping %1", ch) - ret = Builtins.mergestring( - Builtins.splitstring(ret, ch), - Ops.add("\\", ch) - ) - i = Ops.add(i, 1) - end - end - - ret - end - def HandleSLPListDialog(services) services_ref = arg_ref(services.value) InitSLPListFoundDialog(services_ref, nil) @@ -480,17 +459,11 @@ elsif ret == :tree_of_services InitDetailsButton() elsif ret == :filter - regexp_string = Convert.to_string( - UI.QueryWidget(Id(:filter_text), :Value) - ) - Builtins.y2milestone("original regexp_string: %1", regexp_string) - # escape special character in the input string - # \ must be the first character! - regexp_string = EscapeChars(regexp_string, "\\(){}[]+^$|") - Builtins.y2milestone("escaped regexp_string: %1", regexp_string) + filter_string = UI.QueryWidget(Id(:filter_text), :Value) + Builtins.y2milestone("filter_string: %1", filter_string) services_ref = arg_ref(services.value) - InitSLPListFoundDialog(services_ref, regexp_string) + InitSLPListFoundDialog(services_ref, filter_string) services.value = services_ref.value elsif ret == :details services_ref = arg_ref(services.value) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
