Script 'mail_helper' called by mrueckert Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: mrueckert. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /work/src/done/SLE12/yast2-ruby-bindings -> sle12 ## BNC# 881124 : "Gettext exception during installation" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-06-03 13:52:32.000000000 +0200 +++ /work/src/done/SLE12/yast2-ruby-bindings/yast2-ruby-bindings.changes 2014-06-04 11:24:37.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 3 17:52:12 UTC 2014 - jreidinger@suse.com + +- fix crash of n_ as now textdomain is array (bnc#881124) +- 3.1.20 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-ruby-bindings - at least 77 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-ruby-bindings (Old) and /work/src/done/SLE12/yast2-ruby-bindings (BS:build ID:38987 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ruby-bindings", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-ruby-bindings-3.1.19.tar.bz2 New: ---- yast2-ruby-bindings-3.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ruby-bindings.spec ++++++ --- /var/tmp/diff_new_pack.NCXxiE/_old 2014-06-06 17:01:00.000000000 +0200 +++ /var/tmp/diff_new_pack.NCXxiE/_new 2014-06-06 17:01:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 ++++++ yast2-ruby-bindings-3.1.19.tar.bz2 -> yast2-ruby-bindings-3.1.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.19/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.1.20/package/yast2-ruby-bindings.changes --- old/yast2-ruby-bindings-3.1.19/package/yast2-ruby-bindings.changes 2014-06-03 10:49:14.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.20/package/yast2-ruby-bindings.changes 2014-06-04 11:21:28.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 3 17:52:12 UTC 2014 - jreidinger@suse.com + +- fix crash of n_ as now textdomain is array (bnc#881124) +- 3.1.20 + +------------------------------------------------------------------- Mon Jun 2 14:29:54 UTC 2014 - mvidner@suse.com - Converted "should" to "expect" in RSpec, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.19/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.1.20/package/yast2-ruby-bindings.spec --- old/yast2-ruby-bindings-3.1.19/package/yast2-ruby-bindings.spec 2014-06-03 10:49:14.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.20/package/yast2-ruby-bindings.spec 2014-06-04 11:21:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.19 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.19/src/ruby/yast/i18n.rb new/yast2-ruby-bindings-3.1.20/src/ruby/yast/i18n.rb --- old/yast2-ruby-bindings-3.1.19/src/ruby/yast/i18n.rb 2014-06-03 10:49:14.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.20/src/ruby/yast/i18n.rb 2014-06-04 11:21:28.000000000 +0200 @@ -43,9 +43,8 @@ # no textdomain configured yet return str unless @my_textdomain - old_text_domain = FastGettext.text_domain # Switching textdomain clears gettext caches so avoid it if possible. - if !@my_textdomain.include?(old_text_domain) || + if !@my_textdomain.include?(FastGettext.text_domain) || !FastGettext.key_exist?(str) # Set domain where key is defined. @my_textdomain.each do |domain| @@ -54,8 +53,6 @@ end end FastGettext::Translation::_ str - ensure - FastGettext.text_domain = old_text_domain end # No translation, only marks the text to be found by gettext when creating POT file, @@ -102,11 +99,17 @@ # no textdomain configured yet return (num == 1) ? singular : plural unless @my_textdomain - old_text_domain = FastGettext.text_domain - FastGettext.text_domain = @my_textdomain + # Switching textdomain clears gettext caches so avoid it if possible. + # difference between _ and n_ is hat we need special cache for plural forms + if !@my_textdomain.include?(FastGettext.text_domain) || + !FastGettext.cached_plural_find(singular, plural) + # Set domain where key is defined. + @my_textdomain.each do |domain| + FastGettext.text_domain = domain + break if FastGettext.cached_plural_find(singular, plural) + end + end FastGettext::Translation::n_(singular, plural, num) - ensure - FastGettext.text_domain = old_text_domain end private @@ -137,6 +140,5 @@ lang end - end end continue with "q"... Checked in at Fri Jun 6 17:01:45 CEST 2014 by mrueckert Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org