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-squid -> sle12
## BNC# 871873 : "squid[4116]: Error Directory /usr/share/squid/errors/English: (2) No such file or directory" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-squid/yast2-squid.changes 2014-03-31 17:23:39.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-squid/yast2-squid.changes 2014-04-04 13:33:39.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 4 11:19:40 UTC 2014 - jreidinger(a)suse.com
+
+- Adapt to new paths to error pages messages (bnc#871873)
+- 3.1.3
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-schema
- yast2-squid
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-squid (Old)
and /mounts/work_src_done/SLE12/yast2-squid (BS:build ID:35533 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-squid", Maintainer is "yast-commit(a)opensuse.org"
Old:
----
yast2-squid-3.1.2.tar.bz2
New:
----
yast2-squid-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-squid.spec ++++++
--- /var/tmp/diff_new_pack.zbjjy3/_old 2014-04-09 17:13:40.000000000 +0200
+++ /var/tmp/diff_new_pack.zbjjy3/_new 2014-04-09 17:13:40.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-squid
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-squid-3.1.2.tar.bz2 -> yast2-squid-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.2/package/yast2-squid.changes new/yast2-squid-3.1.3/package/yast2-squid.changes
--- old/yast2-squid-3.1.2/package/yast2-squid.changes 2014-03-31 15:43:22.000000000 +0200
+++ new/yast2-squid-3.1.3/package/yast2-squid.changes 2014-04-04 13:33:16.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Apr 4 11:19:40 UTC 2014 - jreidinger(a)suse.com
+
+- Adapt to new paths to error pages messages (bnc#871873)
+- 3.1.3
+
+-------------------------------------------------------------------
Mon Mar 31 15:34:34 CEST 2014 - locilka(a)suse.com
- Old testsuites adapted to the new Service/Systemd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.2/package/yast2-squid.spec new/yast2-squid-3.1.3/package/yast2-squid.spec
--- old/yast2-squid-3.1.2/package/yast2-squid.spec 2014-03-31 15:43:22.000000000 +0200
+++ new/yast2-squid-3.1.3/package/yast2-squid.spec 2014-04-04 13:33:16.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-squid
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.2/src/modules/Squid.rb new/yast2-squid-3.1.3/src/modules/Squid.rb
--- old/yast2-squid-3.1.2/src/modules/Squid.rb 2014-03-31 15:43:22.000000000 +0200
+++ new/yast2-squid-3.1.3/src/modules/Squid.rb 2014-04-04 13:33:16.000000000 +0200
@@ -125,7 +125,7 @@
"emulate_httpd_log" => ["off"],
"connect_timeout" => ["2", "minutes"],
"client_lifetime" => ["1", "days"],
- "error_directory" => ["/usr/share/squid/errors/English"],
+ "error_directory" => ["/usr/share/squid/errors/en"],
"cache_mgr" => ["webmaster"],
"ftp_passive" => ["on"]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.2/src/modules/SquidErrorMessages.rb new/yast2-squid-3.1.3/src/modules/SquidErrorMessages.rb
--- old/yast2-squid-3.1.2/src/modules/SquidErrorMessages.rb 2014-03-31 15:43:22.000000000 +0200
+++ new/yast2-squid-3.1.3/src/modules/SquidErrorMessages.rb 2014-04-04 13:33:16.000000000 +0200
@@ -46,99 +46,54 @@
# Directory where is located directories with messages in various languages.
@err_msg_dir = "/usr/share/squid/errors"
+ # squid use ISO 639-1 encoding for languages
+ # TODO refactor it to generaly available
@trans_map = {
- # language name - combo box entry
- "Armenian" => _("Armenian"),
- # language name - combo box entry
- "Catalan" => _("Catalan"),
- # language name - combo box entry
- "Dutch" => _("Dutch"),
- # language name - combo box entry
- "Finnish" => _("Finnish"),
- # language name - combo box entry
- "Greek" => _("Greek"),
- # language name - combo box entry
- "Italian" => _("Italian"),
- # language name - combo box entry
- "Lithuanian" => _(
- "Lithuanian"
- ),
- # language name - combo box entry
- "Romanian" => _("Romanian"),
- # language name - combo box entry
- "Serbian" => _("Serbian"),
- # language name - combo box entry
- "Spanish" => _("Spanish"),
- # language name - combo box entry
- "Turkish" => _("Turkish"),
- # language name - combo box entry; don't translate the encoding suffix
- "Ukrainian-1251" => _(
- "Ukrainian-1251"
- ),
- # language name - combo box entry
- "Azerbaijani" => _(
- "Azerbaijani"
- ),
- # language name - combo box entry
- "Czech" => _("Czech"),
- # language name - combo box entry
- "English" => _("English"),
- # language name - combo box entry
- "French" => _("French"),
- # language name - combo box entry
- "Hebrew" => _("Hebrew"),
- # language name - combo box entry
- "Japanese" => _("Japanese"),
- # language name - combo box entry
- "Polish" => _("Polish"),
- # language name - combo box entry; don't translate the encoding suffix
- "Russian-koi8-r" => _(
- "Russian-koi8-r"
- ),
- # language name - combo box entry
- "Simplify Chinese" => _(
- "Simplified Chinese"
- ),
- # language name - combo box entry
- "Swedish" => _("Swedish"),
- # language name - combo box entry; don't translate the encoding suffix
- "Ukrainian-koi8-u" => _(
- "Ukrainian-koi8-u"
- ),
- # language name - combo box entry
- "Bulgarian" => _(
- "Bulgarian"
- ),
- # language name - combo box entry
- "Danish" => _("Danish"),
- # language name - combo box entry
- "Estonian" => _("Estonian"),
- # language name - combo box entry
- "German" => _("German"),
- # language name - combo box entry
- "Hungarian" => _(
- "Hungarian"
- ),
- # language name - combo box entry
- "Korean" => _("Korean"),
- # language name - combo box entry
- "Portuguese" => _(
- "Portuguese"
- ),
- # language name - combo box entry; don't translate the encoding suffix
- "Russian-1251" => _(
- "Russian-1251"
- ),
- # language name - combo box entry
- "Slovak" => _("Slovak"),
- # language name - combo box entry
- "Traditional Chinese" => _(
- "Traditional Chinese"
- ),
- # language name - combo box entry; don't translate the encoding suffix
- "Ukrainian-utf8" => _(
- "Ukrainian-utf8"
- )
+ # TRANSLATORS: language name - combo box entry
+ "af" => _("Afrikaans"),
+ "ar" => _("Arabic"),
+ "hy" => _("Armenian"),
+ "az" => _("Azerbaijani"),
+ "bg" => _("Bulgarian"),
+ "ca" => _("Catalan"),
+ "cs" => _("Czech"),
+ "da" => _("Danish"),
+ "de" => _("German"),
+ "el" => _("Greek"),
+ "en" => _("English"),
+ "es" => _("Spanish"),
+ "et" => _("Estonian"),
+ "fa" => _("Persian"),
+ "fi" => _("Finnish"),
+ "fr" => _("French"),
+ "he" => _("Hebrew"),
+ "hu" => _("Hungarian"),
+ "id" => _("Indonesian"),
+ "it" => _("Italian"),
+ "ja" => _("Japanese"),
+ "ko" => _("Korean"),
+ "lv" => _("Latvian"),
+ "lt" => _("Lithuanian"),
+ "ms" => _("Malay"),
+ "nl" => _("Dutch"),
+ "oc" => _("Occitan"),
+ "pl" => _("Polish"),
+ "pt" => _("Portuguese"),
+ "pt-br" => _("Brazilian Portuguese"),
+ "ro" => _("Romanian"),
+ "ru" => _("Russian"),
+ "sk" => _("Slovak"),
+ "sl" => _("Slovenian"),
+ "sr-cyrl" => _("Serbian Cyrillic"),
+ "sr-latn" => _("Serbian Latin"),
+ "sv" => _("Swedish"),
+ "th" => _("Thai"),
+ "tr" => _("Turkish"),
+ "uk" => _("Ukrainian"),
+ "uz" => _("Uzbek"),
+ "vi" => _("Vietnamese"),
+ "zh-cn" => _("Simplified Chinese"),
+ "zh-tw" => _("Traditional Chinese"),
}
end
@@ -181,14 +136,9 @@
def GetLanguagesToComboBox
read
- ret = []
- Builtins.foreach(GetLanguages()) do |language|
- ret = Builtins.add(
- ret,
- Item(Id(language), Ops.get(@trans_map, language, language))
- )
+ return GetLanguages().map do |language|
+ Item(Id(language), @trans_map[language] || language)
end
- deep_copy(ret)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.2/testsuite/tests/SquidErrorMessages.out new/yast2-squid-3.1.3/testsuite/tests/SquidErrorMessages.out
--- old/yast2-squid-3.1.2/testsuite/tests/SquidErrorMessages.out 2014-03-31 15:43:22.000000000 +0200
+++ new/yast2-squid-3.1.3/testsuite/tests/SquidErrorMessages.out 2014-04-04 13:33:16.000000000 +0200
@@ -1,16 +1,16 @@
Dump GetLanguages()
-Read .target.dir "/usr/share/squid/errors" ["Russian-1251", "a_file", "English", "b_file", "Simplify_Chinese", "c_file"]
-Return ["English", "Russian-1251", "Simplify Chinese"]
+Read .target.dir "/usr/share/squid/errors" ["en", "a_file", "ru", "b_file", "uk", "c_file"]
+Return ["en", "ru", "uk"]
Dump
Dump GetLanguagesToComboBox()
-Return [`item (`id ("English"), "English"), `item (`id ("Russian-1251"), "Russian-1251"), `item (`id ("Simplify Chinese"), "Simplified Chinese")]
+Return [`item (`id ("en"), "English"), `item (`id ("ru"), "Russian"), `item (`id ("uk"), "Ukrainian")]
Dump
-Dump GetPath("English")
-Return /usr/share/squid/errors/English
-Dump GetPath("Simplify Chinese")
-Return /usr/share/squid/errors/Simplify_Chinese
+Dump GetPath("en")
+Return /usr/share/squid/errors/en
+Dump GetPath("uk")
+Return /usr/share/squid/errors/uk
Dump
-Dump GetLanguageFromPath(/usr/share/squid/errors/English)
-Return English
-Dump GetLanguageFromPath(/usr/share/squid/errors/Simplify_Chinese)
-Return Simplify Chinese
+Dump GetLanguageFromPath(/usr/share/squid/errors/en)
+Return en
+Dump GetLanguageFromPath(/usr/share/squid/errors/uk)
+Return ru
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-squid-3.1.2/testsuite/tests/SquidErrorMessages.rb new/yast2-squid-3.1.3/testsuite/tests/SquidErrorMessages.rb
--- old/yast2-squid-3.1.2/testsuite/tests/SquidErrorMessages.rb 2014-03-31 15:43:22.000000000 +0200
+++ new/yast2-squid-3.1.3/testsuite/tests/SquidErrorMessages.rb 2014-04-04 13:33:16.000000000 +0200
@@ -9,11 +9,11 @@
{
"target" => {
"dir" => [
- "Russian-1251",
+ "en",
"a_file",
- "English",
+ "ru",
"b_file",
- "Simplify_Chinese",
+ "uk",
"c_file"
]
}
@@ -47,14 +47,14 @@
], nil)
DUMP("")
- DUMP("GetPath(\"English\")")
- TEST(lambda { SquidErrorMessages.GetPath("English") }, [
+ DUMP("GetPath(\"en\")")
+ TEST(lambda { SquidErrorMessages.GetPath("en") }, [
@READ,
@WRITE,
@EXECUTE
], nil)
- DUMP("GetPath(\"Simplify Chinese\")")
- TEST(lambda { SquidErrorMessages.GetPath("Simplify Chinese") }, [
+ DUMP("GetPath(\"uk\")")
+ TEST(lambda { SquidErrorMessages.GetPath("uk") }, [
@READ,
@WRITE,
@EXECUTE
@@ -65,14 +65,14 @@
Ops.add(
Ops.add(
Ops.add("GetLanguageFromPath(", SquidErrorMessages.err_msg_dir),
- "/English"
+ "/en"
),
")"
)
)
TEST(lambda do
SquidErrorMessages.GetLanguageFromPath(
- Ops.add(SquidErrorMessages.err_msg_dir, "/English")
+ Ops.add(SquidErrorMessages.err_msg_dir, "/en")
)
end, [
@READ,
@@ -83,14 +83,14 @@
Ops.add(
Ops.add(
Ops.add("GetLanguageFromPath(", SquidErrorMessages.err_msg_dir),
- "/Simplify_Chinese"
+ "/uk"
),
")"
)
)
TEST(lambda do
SquidErrorMessages.GetLanguageFromPath(
- Ops.add(SquidErrorMessages.err_msg_dir, "/Simplify_Chinese")
+ Ops.add(SquidErrorMessages.err_msg_dir, "/ru")
)
end, [
@READ,
continue with "q"...
Checked in at Wed Apr 9 17:13:53 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: yast-commit+help(a)opensuse.org