Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu Jan 18 16:39:11 CET 2007.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-01-08 15:02:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-01-18 14:08:37.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Jan 18 11:10:38 CET 2007 - lslezak@suse.cz
+
+- Pkg::SetLocale() and Pkg::GetLocale() have been split into
+ Pkg::SetTextLocale(), Pkg::GetTextLocale(),
+ Pkg::SetPackageLocale() and Pkg::GetPackageLocale() to set
+ the textdomain and the language packages independently (#223624)
+- 2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.15.2.tar.bz2
New:
----
yast2-pkg-bindings-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.Uu4558/_old 2007-01-18 16:38:38.000000000 +0100
+++ /var/tmp/diff_new_pack.Uu4558/_new 2007-01-18 16:38:38.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.15.2)
+# spec file for package yast2-pkg-bindings (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-pkg-bindings
-Version: 2.15.2
-Release: 2
+Version: 2.15.3
+Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.15.2.tar.bz2
+Source0: yast2-pkg-bindings-2.15.3.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 2.4.0
@@ -40,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.15.2
+%setup -n yast2-pkg-bindings-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,12 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Thu Jan 18 2007 - lslezak@suse.cz
+- Pkg::SetLocale() and Pkg::GetLocale() have been split into
+ Pkg::SetTextLocale(), Pkg::GetTextLocale(),
+ Pkg::SetPackageLocale() and Pkg::GetPackageLocale() to set
+ the textdomain and the language packages independently (#223624)
+- 2.15.3
* Mon Jan 08 2007 - lslezak@suse.cz
- Pkg::GetPackages supports `taboo and `locked options,
Pkg::ResolvableProperties returns "locked" value
++++++ yast2-pkg-bindings-2.15.2.tar.bz2 -> yast2-pkg-bindings-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.2/configure new/yast2-pkg-bindings-2.15.3/configure
--- old/yast2-pkg-bindings-2.15.2/configure 2007-01-08 14:59:29.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.3/configure 2007-01-18 13:56:26.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.2.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.15.2'
-PACKAGE_STRING='yast2-pkg-bindings 2.15.2'
+PACKAGE_VERSION='2.15.3'
+PACKAGE_STRING='yast2-pkg-bindings 2.15.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1429,7 +1429,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-pkg-bindings 2.15.2 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.15.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1500,7 +1500,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.2:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.3:";;
esac
cat <<\_ACEOF
@@ -1608,7 +1608,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.15.2
+yast2-pkg-bindings configure 2.15.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1622,7 +1622,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-pkg-bindings $as_me 2.15.2, which was
+It was created by yast2-pkg-bindings $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2423,7 +2423,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.15.2'
+ VERSION='2.15.3'
cat >>confdefs.h <<_ACEOF
@@ -2650,7 +2650,7 @@
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -21612,7 +21612,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-pkg-bindings $as_me 2.15.2, which was
+This file was extended by yast2-pkg-bindings $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21665,7 +21665,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.15.2
+yast2-pkg-bindings config.status 2.15.3
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.2/configure.in new/yast2-pkg-bindings-2.15.3/configure.in
--- old/yast2-pkg-bindings-2.15.2/configure.in 2007-01-08 14:59:17.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.3/configure.in 2007-01-18 13:56:11.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.15.2, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.15.3, http://bugs.opensuse.org/, yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.2/src/Callbacks.cc new/yast2-pkg-bindings-2.15.3/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.15.2/src/Callbacks.cc 2006-11-29 09:42:25.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.3/src/Callbacks.cc 2007-01-11 10:37:36.000000000 +0100
@@ -1989,7 +1989,7 @@
/**
* @builtin CallbackSourceReportEnd
* @short Register callback function
- * @param string func Name of the callback handler function. Required callback prototype is <code>void(integer numeric_id, string url, string error, string reason)</code>. Parameter error is "NO_ERROR", "NOT_FOUND", "IO" or "INVALID". The callback function is evaluated when an error occurrs. The callback function must return string "ABORT", "IGNORE" or "RETRY".
+ * @param string func Name of the callback handler function. Required callback prototype is <code>void(integer numeric_id, string url, string task, string error, string reason)</code>. Parameter error is "NO_ERROR", "NOT_FOUND", "IO" or "INVALID". The callback function is evaluated when an error occurrs. The callback function must return string "ABORT", "IGNORE" or "RETRY".
* @return void
*/
YCPValue PkgModuleFunctions::CallbackSourceReportEnd( const YCPString& func)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.2/src/PkgModuleFunctions.cc new/yast2-pkg-bindings-2.15.3/src/PkgModuleFunctions.cc
--- old/yast2-pkg-bindings-2.15.2/src/PkgModuleFunctions.cc 2006-11-22 12:45:02.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.3/src/PkgModuleFunctions.cc 2007-01-18 13:25:54.000000000 +0100
@@ -296,22 +296,49 @@
return YCPVoid();
}
-
/**
- * @builtin SetLocale
- * @short Set Prefered Locale
+ * @builtin SetTextLocale
+ * @short Set Package Manager Locale
* @description
- * set the given locale as the "preferred" locale
+ * Set the given locale as the output locale -- all messages from the package manager (errors, warnings,...)
+ * will be returned in the selected language. This built-in does not change package selection in any way.
* @param string locale Locale
* @return void
*/
YCPValue
-PkgModuleFunctions::SetLocale (const YCPString &locale)
+PkgModuleFunctions::SetTextLocale (const YCPString &locale)
{
try
{
zypp::Locale loc = zypp::Locale(locale->value());
zypp_ptr()->setTextLocale(loc);
+ }
+ catch (const std::exception& excpt)
+ {
+ y2error("Caught an exception: %s", excpt.what());
+ }
+ catch (...)
+ {
+ y2internal("Caught an unknown exception");
+ }
+
+ return YCPVoid();
+}
+
+/**
+ * @builtin SetPackageLocale
+ * @short Select locale for installation
+ * @description
+ * Select the main locale for installation, call Pkg::PkgSolve() to select the respective packages.
+ * @param string locale Locale
+ * @return void
+ */
+YCPValue
+PkgModuleFunctions::SetPackageLocale (const YCPString &locale)
+{
+ try
+ {
+ zypp::Locale loc = zypp::Locale(locale->value());
// add packages for the preferred locale, preserve additional locales
zypp::ZYpp::LocaleSet lset = zypp_ptr()->getRequestedLocales();
@@ -337,13 +364,32 @@
}
/**
- * @builtin GetLocale
+ * @builtin SetLocale
+ * @short Set The Main (Preferred) Locale -- OBSOLETED!
+ * @description
+ * OBSOLETED, DO NOT USE! It has been replaced by SetTextLocale() and SetMainLocale() calls (see bug #223624)
+ * @param string locale Locale
+ * @return void
+ */
+YCPValue
+PkgModuleFunctions::SetLocale (const YCPString &locale)
+{
+ y2warning("Pkg::SetLocale() is obsoleted, use Pkg::SetTextLocale() and/or Pkg::SetPackageLocale() instead. Pkg::SetLocale() currently calls both functions");
+
+ SetTextLocale(locale);
+ SetPackageLocale(locale);
+
+ return YCPVoid();
+}
+
+/**
+ * @builtin GetTextLocale
* @short get the currently preferred locale
* @return string locale
- * @usage Pkg::GetLocale () -> "en_US"
+ * @usage Pkg::GetTextLocale() -> "en_US"
*/
YCPValue
-PkgModuleFunctions::GetLocale ()
+PkgModuleFunctions::GetTextLocale ()
{
try
{
@@ -356,14 +402,40 @@
return YCPVoid();
}
+/**
+ * @builtin GetLocale
+ * @short get the currently preferred locale
+ * @return string locale
+ * @usage Pkg::GetLocale () -> "en_US"
+ */
+YCPValue
+PkgModuleFunctions::GetLocale ()
+{
+ y2warning("Pkg::GetLocale() is obsoleted, use Pkg::GetTextLocale() or Pkg::GetPackageLocale() instead. Pkg::GetLocale() currently calls Pkg::GetTextLocale()");
+ return GetTextLocale();
+}
+
+/**
+ * @builtin GetPackageLocale
+ * @short get the locale set by Pkg::SetPackageLocale() call
+ * @return string locale
+ * @usage Pkg::GetPackageLocale () -> "en_US"
+ */
+YCPValue
+PkgModuleFunctions::GetPackageLocale ()
+{
+ return YCPString(preferred_locale.code());
+}
/**
* @builtin SetAdditionalLocales
*
* @short set list of additional locales
+ * @description
+ * Select additional languages for installation. Call Pkg::Solve() to select the respective packages.
* @param list<string> locales List of additional locales
* @return void
- * @usage Pkg::SetAdditionalLocales([de_DE]);
+ * @usage Pkg::SetAdditionalLocales(["de_DE"]);
*/
YCPValue
PkgModuleFunctions::SetAdditionalLocales (YCPList langycplist)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.2/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.15.3/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.15.2/src/PkgModuleFunctions.h 2006-11-29 09:46:07.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.3/src/PkgModuleFunctions.h 2007-01-18 08:46:33.000000000 +0100
@@ -144,6 +144,14 @@
YCPValue SetLocale (const YCPString& locale);
/* TYPEINFO: string() */
YCPValue GetLocale ();
+ /* TYPEINFO: void(string) */
+ YCPValue SetTextLocale(const YCPString&);
+ /* TYPEINFO: void(string) */
+ YCPValue SetPackageLocale(const YCPString&);
+ /* TYPEINFO: string() */
+ YCPValue GetTextLocale();
+ /* TYPEINFO: string() */
+ YCPValue GetPackageLocale();
/* TYPEINFO: void(list<string>) */
YCPValue SetAdditionalLocales (YCPList args);
/* TYPEINFO: list<string>() */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.2/VERSION new/yast2-pkg-bindings-2.15.3/VERSION
--- old/yast2-pkg-bindings-2.15.2/VERSION 2007-01-08 14:44:12.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.3/VERSION 2007-01-18 13:38:08.000000000 +0100
@@ -1 +1 @@
-2.15.2
+2.15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org