commit yast2-packager for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Sun Sep 27 00:23:36 CEST 2009. -------- --- yast2-packager/yast2-packager.changes 2009-09-09 13:38:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2009-09-23 15:32:00.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Sep 23 15:00:04 CEST 2009 - kmachalkova@suse.cz + +- Use getenv to query current language for displaying the license + (instead of uninitialized data from Language:: - bnc#504803, c#28) +- Removed catch-all regexps from license file name patterns - UI + can display only html and txt anyway +- 2.18.12 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.18.11.tar.bz2 New: ---- yast2-packager-2.18.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.cYvcOK/_old 2009-09-27 00:23:23.000000000 +0200 +++ /var/tmp/diff_new_pack.cYvcOK/_new 2009-09-27 00:23:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.18.11) +# spec file for package yast2-packager (Version 2.18.12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-packager -Version: 2.18.11 +Version: 2.18.12 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.18.11.tar.bz2 +Source0: yast2-packager-2.18.12.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -79,7 +79,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.18.11 +%setup -n yast2-packager-2.18.12 %build %{prefix}/bin/y2tool y2autoconf @@ -127,5 +127,4 @@ /usr/share/YaST2/modules/WebpinPackageSearch.ycp /usr/share/YaST2/modules/WebpinPackageSearch.ybc %{prefix}/share/applications/YaST2/webpin.desktop - %changelog ++++++ yast2-packager-2.18.11.tar.bz2 -> yast2-packager-2.18.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.11/VERSION new/yast2-packager-2.18.12/VERSION --- old/yast2-packager-2.18.11/VERSION 2009-09-09 13:32:25.000000000 +0200 +++ new/yast2-packager-2.18.12/VERSION 2009-09-23 14:53:48.000000000 +0200 @@ -1 +1 @@ -2.18.11 +2.18.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.18.11/src/modules/ProductLicense.ycp new/yast2-packager-2.18.12/src/modules/ProductLicense.ycp --- old/yast2-packager-2.18.11/src/modules/ProductLicense.ycp 2009-09-09 13:23:13.000000000 +0200 +++ new/yast2-packager-2.18.12/src/modules/ProductLicense.ycp 2009-09-23 10:54:52.000000000 +0200 @@ -37,9 +37,20 @@ list <string> license_patterns = [ "license\\.html", "license\\.%1\\.html", "license\\.htm", "license\\.%1\\.htm", - "license\\.txt", "license\\.%1\\.txt", - "license\\.*$", "license\\.%1\\.*$" + "license\\.txt", "license\\.%1\\.txt" ]; +// no more wildcard patterns here, UI can display only html and txt anyway + +// Helper func. Cuts encoding suffix off the LANG +// env. variable i.e. foo_BAR.UTF-8 => foo_BAR +string EnvLangToLangCode ( string env_lang ) +{ + list <string> tmp = []; + if (env_lang != nil) + tmp = splitstring(env_lang, ".@"); + + return tmp[0]:""; +} /** * Creates a unique identification from filename @@ -624,10 +635,16 @@ if (info_file == nil && size (licenses) == 0) return `auto; + // Let's do getenv here. Language::language may not be initialized + // by now (see bnc#504803, c#28). Language::Language does only + // sysconfig reading, which is not too useful in cases like + // 'LANG=foo_BAR yast repositories' + string language = EnvLangToLangCode( getenv("LANG") ); + // Preferencies how the client selects from available languages list<string> langs = [ - Language::language, - substring (Language::language, 0, 2), // "it_IT" -> "it" + language, + substring (language, 0, 2), // "it_IT" -> "it" "en_US", "en_GB", "en", @@ -647,7 +664,7 @@ }); } - y2milestone ("Preffered lang: %1", Language::language); + y2milestone ("Preffered lang: %1", language); if (size (available_langs) == 0) return `auto; // no license available lic_lang = find (string l, langs, { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de