[yast-commit] [ci_new_pac] JFYI yast2-packager -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-packager -> sle12 ## BNC# 888981 : "pattern selection will be overwritten by the default desktop pattern selection" (RESOLVED/FIXED) ## BNC# 869653 : "Yast Add-Ons: Adding using SLP: Filter is case-sensitive" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-07-11 14:55:31.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-07-25 15:20:10.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jul 25 14:17:20 CEST 2014 - schubi@suse.de + +- 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 - cwh@suse.com + +- Made SLP browser filter case-insensitive (bnc#869653) + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-packager - at least 26 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old) and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:41830 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.30.tar.bz2 New: ---- yast2-packager-3.1.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.a3r43b/_old 2014-07-25 16:14:10.000000000 +0200 +++ /var/tmp/diff_new_pack.a3r43b/_new 2014-07-25 16:14:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.30 +Version: 3.1.31 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.30.tar.bz2 -> yast2-packager-3.1.31.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.31/package/yast2-packager.changes --- old/yast2-packager-3.1.30/package/yast2-packager.changes 2014-07-11 14:35:28.000000000 +0200 +++ new/yast2-packager-3.1.31/package/yast2-packager.changes 2014-07-25 15:16:14.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Jul 25 14:17:20 CEST 2014 - schubi@suse.de + +- 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 - cwh@suse.com + +- Made SLP browser filter case-insensitive (bnc#869653) + +------------------------------------------------------------------- Fri Jul 11 12:29:40 UTC 2014 - lslezak@suse.cz - 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.31/package/yast2-packager.spec --- old/yast2-packager-3.1.30/package/yast2-packager.spec 2014-07-11 14:35:28.000000000 +0200 +++ new/yast2-packager-3.1.31/package/yast2-packager.spec 2014-07-25 15:16:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.30 +Version: 3.1.31 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.31/src/modules/DefaultDesktop.rb --- old/yast2-packager-3.1.30/src/modules/DefaultDesktop.rb 2014-07-11 14:35:28.000000000 +0200 +++ new/yast2-packager-3.1.31/src/modules/DefaultDesktop.rb 2014-07-25 15:16:14.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/SourceManagerSLP.rb new/yast2-packager-3.1.31/src/modules/SourceManagerSLP.rb --- old/yast2-packager-3.1.30/src/modules/SourceManagerSLP.rb 2014-07-11 14:35:28.000000000 +0200 +++ new/yast2-packager-3.1.31/src/modules/SourceManagerSLP.rb 2014-07-25 15:16:15.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) continue with "q"... Checked in at Fri Jul 25 16:14:22 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro