Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu Aug 16 18:34:57 CEST 2007.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-08-09 10:27:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-08-16 14:51:41.224804000 +0200
@@ -1,0 +2,10 @@
+Wed Aug 15 13:51:11 CEST 2007 - lslezak@suse.cz
+
+- return history of exceptions in Pkg::LastError() result (#299716)
+- Pkg::SourceCreate() - use the last path component from URL as
+ name (#299816)
+- Pkg::SourceCreate() - disable autorefresh for CD/DVD repositories
+ (#300928)
+- 2.15.43
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.15.42.tar.bz2
New:
----
yast2-pkg-bindings-2.15.43.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.R11503/_old 2007-08-16 18:34:26.000000000 +0200
+++ /var/tmp/diff_new_pack.R11503/_new 2007-08-16 18:34:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.42)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.43)
#
# 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-devel-doc
-Version: 2.15.42
+Version: 2.15.43
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.15.42.tar.bz2
+Source0: yast2-pkg-bindings-2.15.43.tar.bz2
prefix: /usr
# same as in the main package (because we use the same configure.in.in)
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
@@ -37,7 +37,7 @@
Ladislav Slez�k
%prep
-%setup -n yast2-pkg-bindings-2.15.42
+%setup -n yast2-pkg-bindings-2.15.43
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.R11503/_old 2007-08-16 18:34:26.000000000 +0200
+++ /var/tmp/diff_new_pack.R11503/_new 2007-08-16 18:34:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.15.42)
+# spec file for package yast2-pkg-bindings (Version 2.15.43)
#
# 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.42
+Version: 2.15.43
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.15.42.tar.bz2
+Source0: yast2-pkg-bindings-2.15.43.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 >= 3.13.11
@@ -40,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.15.42
+%setup -n yast2-pkg-bindings-2.15.43
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -73,6 +73,13 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Wed Aug 15 2007 - lslezak@suse.cz
+- return history of exceptions in Pkg::LastError() result (#299716)
+- Pkg::SourceCreate() - use the last path component from URL as
+ name (#299816)
+- Pkg::SourceCreate() - disable autorefresh for CD/DVD repositories
+ (#300928)
+- 2.15.43
* Thu Aug 09 2007 - lslezak@suse.cz
- Pkg::SourceScan(), Pkg::SourceCreate() - use product name or URL
as alias and name, don't use timestamp (#298723)
++++++ yast2-pkg-bindings-2.15.42.tar.bz2 -> yast2-pkg-bindings-2.15.43.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.42/configure new/yast2-pkg-bindings-2.15.43/configure
--- old/yast2-pkg-bindings-2.15.42/configure 2007-08-09 10:22:08.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/configure 2007-08-16 14:45:21.000000000 +0200
@@ -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.42.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.43.
#
# 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.42'
-PACKAGE_STRING='yast2-pkg-bindings 2.15.42'
+PACKAGE_VERSION='2.15.43'
+PACKAGE_STRING='yast2-pkg-bindings 2.15.43'
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.42 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.15.43 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.42:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.43:";;
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.42
+yast2-pkg-bindings configure 2.15.43
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.42, which was
+It was created by yast2-pkg-bindings $as_me 2.15.43, 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.42'
+ VERSION='2.15.43'
cat >>confdefs.h <<_ACEOF
@@ -2650,7 +2650,7 @@
-VERSION="2.15.42"
+VERSION="2.15.43"
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.42, which was
+This file was extended by yast2-pkg-bindings $as_me 2.15.43, 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.42
+yast2-pkg-bindings config.status 2.15.43
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.42/configure.in new/yast2-pkg-bindings-2.15.43/configure.in
--- old/yast2-pkg-bindings-2.15.42/configure.in 2007-08-09 10:21:34.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/configure.in 2007-08-16 14:45:07.000000000 +0200
@@ -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.42, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.15.43, 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.42"
+VERSION="2.15.43"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.42/src/Package.cc new/yast2-pkg-bindings-2.15.43/src/Package.cc
--- old/yast2-pkg-bindings-2.15.42/src/Package.cc 2007-08-03 09:54:18.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/src/Package.cc 2007-08-15 13:31:39.000000000 +0200
@@ -2152,7 +2152,7 @@
catch (const zypp::Exception& excpt)
{
y2error("An error occurred during Pkg::PkgSolveCheckTargetOnly");
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
}
return YCPBoolean(result);
@@ -2229,7 +2229,7 @@
catch (const zypp::Exception& excpt)
{
y2error("Pkg::Commit has failed: ZYpp::commit has failed");
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
return YCPVoid();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.42/src/PkgModuleFunctions.cc new/yast2-pkg-bindings-2.15.43/src/PkgModuleFunctions.cc
--- old/yast2-pkg-bindings-2.15.42/src/PkgModuleFunctions.cc 2007-08-08 16:52:10.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/src/PkgModuleFunctions.cc 2007-08-15 13:29:16.000000000 +0200
@@ -635,6 +635,22 @@
return zypp::RepoManager(repo_options);
}
+// convert Exception object to string represenatation
+std::string PkgModuleFunctions::ExceptionAsString(const zypp::Exception &e)
+{
+ std::string ret = e.asUserString();
+
+ if (e.historySize() > 0)
+ {
+ ret += "\n" + e.historyAsString();
+ }
+
+ y2debug("Error message: %s", ret.c_str());
+
+ return ret;
+}
+
+
/** ------------------------
* Convert InstSrcDescr to product info YCPMap:
* <TABLE>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.42/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.15.43/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.15.42/src/PkgModuleFunctions.h 2007-08-08 16:32:45.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/src/PkgModuleFunctions.h 2007-08-15 13:29:36.000000000 +0200
@@ -178,6 +178,9 @@
zypp::Url shortenUrl(const zypp::Url &url);
+ // convert Exception to string represenatation
+ std::string ExceptionAsString(const zypp::Exception &e);
+
private:
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.42/src/Source.cc new/yast2-pkg-bindings-2.15.43/src/Source.cc
--- old/yast2-pkg-bindings-2.15.42/src/Source.cc 2007-08-08 17:38:42.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/src/Source.cc 2007-08-16 14:15:58.000000000 +0200
@@ -363,7 +363,7 @@
{
// FIXME: assuming the sources are already initialized
y2error ("Error in SourceRestore: %s", excpt.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
success = false;
}
@@ -422,7 +422,7 @@
{
// FIXME: assuming the sources are already initialized
y2error ("Error in SourceLoad: %s", excpt.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
success = false;
}
}
@@ -502,7 +502,7 @@
catch (const zypp::Exception& excpt)
{
y2error ("Error in SourceStartCache: %s", excpt.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
}
// catch an exception from boost (e.g. a file cannot be read by non-root user)
catch (const std::exception& err)
@@ -660,7 +660,7 @@
catch (const zypp::Exception & excpt)
{
y2error("Pkg::SourceSaveAll has failed: %s", excpt.msg().c_str() );
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
return YCPBoolean(false);
}
}
@@ -693,7 +693,7 @@
catch (zypp::Exception & excpt)
{
y2error("Pkg::SourceSaveAll has failed: %s", excpt.msg().c_str() );
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
return YCPBoolean(false);
}
}
@@ -748,7 +748,7 @@
catch (zypp::Exception & excpt)
{
y2error("Pkg::SourceFinishAll has failed: %s", excpt.msg().c_str() );
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
return YCPBoolean(false);
}
@@ -1033,7 +1033,7 @@
if (!optional->value())
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
y2milestone("File not found: %s", f->value_cstr());
}
}
@@ -1157,7 +1157,7 @@
}
catch (const zypp::Exception& excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
y2milestone ("Directory not found: %s", d->value_cstr());
found = false;
}
@@ -1215,7 +1215,7 @@
}
catch (const zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
y2error ("Cannot set the new URL for source %s (%lld): %s",
repo->repoInfo().alias().c_str(), id->asInteger()->value(), excpt.msg().c_str());
return YCPBoolean(false);
@@ -1510,20 +1510,42 @@
// set alias and name
if (alias.empty())
{
- // alias not set via URL, use the passed alias or the URL
+ // alias not set via URL, use the passed alias or the URL path
if (alias_r.empty())
{
- // use URL
+ // use the last path element in URL
std::string url_path = url.getPathName();
- // the URL is too long, extract only the most interesting parts
- if (url_path.size() > 15)
+ std::string::size_type pos_begin = url_path.rfind("/");
+ std::string::size_type pos_end = std::string::npos;
+
+ // ignore the trailing slash
+ if (pos_begin == url_path.size() - 1)
{
- alias = shortenUrl(url).asString();
+ pos_begin = url_path.rfind("/", url_path.size() - 2);
+
+ if (pos_begin != std::string::npos)
+ {
+ pos_end = url_path.size() - pos_begin - 2;
+ }
}
else
{
- alias = url.asString();
+ pos_end = url_path.size() - pos_begin - 1;
+ }
+
+ // ignore the found slash character
+ pos_begin++;
+
+ alias = std::string(url_path, pos_begin, pos_end);
+
+ y2milestone("Alias from URL path: %s", alias.c_str());
+
+ // fallback
+ if (alias.empty())
+ {
+ y2milestone("URL alias is empty using 'Repository'");
+ alias = "Repository";
}
}
else
@@ -1547,13 +1569,22 @@
// add read only mount option to the URL if needed
url = addRO(url);
+ bool autorefresh = true;
+
+ std::string scheme = zypp::str::toLower(url.getScheme());
+ if (scheme == "cd" || scheme == "dvd")
+ {
+ y2milestone("Disabling autorefresh for CD/DVD repository");
+ autorefresh = false;
+ }
+
repo.setAlias(alias);
repo.setName(name);
repo.setType(repotype);
repo.addBaseUrl(url);
repo.setPath(path_r);
repo.setEnabled(true);
- repo.setAutorefresh(true);
+ repo.setAutorefresh(autorefresh);
y2milestone("Adding source '%s' (%s)", repo.alias().c_str(), url.asString().c_str());
// note: exceptions should be caught by the calling code
@@ -1672,7 +1703,7 @@
catch(const zypp::Exception & expt)
{
y2error("Invalid URL: %s", expt.asString().c_str());
- _last_error.setLastError(expt.asUserString());
+ _last_error.setLastError(ExceptionAsString(expt));
return YCPVoid();
}
@@ -1717,7 +1748,7 @@
catch (zypp::repo::RepoUnknownTypeException &e)
{
ycperror("Unknown source type '%s': %s", type.c_str(), e.asString().c_str());
- _last_error.setLastError(e.asUserString());
+ _last_error.setLastError(ExceptionAsString(e));
return YCPVoid();
}
@@ -1783,7 +1814,7 @@
catch(const zypp::Exception & expt )
{
y2error ("Invalid URL: %s", expt.asString().c_str());
- _last_error.setLastError(expt.asUserString());
+ _last_error.setLastError(ExceptionAsString(expt));
return YCPList();
}
@@ -1807,7 +1838,7 @@
{
y2error("Scanning products for '%s' has failed"
, url.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
return ids;
}
@@ -1831,7 +1862,7 @@
{
y2error("SourceScan for '%s' product '%s' has failed"
, url.asString().c_str(), pn.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
}
}
} else {
@@ -1846,7 +1877,7 @@
{
y2error("SourceScan for '%s' product '%s' has failed"
, url.asString().c_str(), pn.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
}
}
@@ -1918,7 +1949,7 @@
catch(const zypp::Exception & expt )
{
y2error ("Invalid URL: %s", expt.asString().c_str());
- _last_error.setLastError(expt.asUserString());
+ _last_error.setLastError(ExceptionAsString(expt));
return YCPInteger (-1LL);
}
@@ -1938,7 +1969,7 @@
}
catch ( const zypp::Exception& excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
y2error( "Cannot read the product list from the media" );
return YCPInteger(ret);
}
@@ -1968,7 +1999,7 @@
{
y2error("SourceCreate for '%s' product '%s' has failed"
, url.asString().c_str(), pn.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
return YCPInteger(-1LL);
}
}
@@ -1988,7 +2019,7 @@
{
y2error("SourceCreate for '%s' product '%s' has failed"
, url.asString().c_str(), pn.asString().c_str());
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
}
}
@@ -2046,7 +2077,7 @@
{
std::string alias = repo->repoInfo().alias();
y2error ("Error for '%s': %s", alias.c_str(), excpt.asString().c_str());
- _last_error.setLastError(alias + ": " + excpt.asUserString());
+ _last_error.setLastError(alias + ": " + ExceptionAsString(excpt));
success = false;
}
@@ -2157,7 +2188,7 @@
{
std::string alias = repo->repoInfo().alias();
y2error ("Error for '%s': %s", alias.c_str(), excpt.asString().c_str());
- _last_error.setLastError(alias + ": " + excpt.asUserString());
+ _last_error.setLastError(alias + ": " + ExceptionAsString(excpt));
success = false;
}
@@ -2388,7 +2419,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
y2error("Pkg::SourceMoveDownloadArea has failed: %s", excpt.msg().c_str());
return YCPBoolean(false);
}
@@ -2478,7 +2509,7 @@
{
std::string alias = repoinfo.alias();
y2error ("Resolvables from '%s' havn't been loaded: %s", alias.c_str(), excpt.asString().c_str());
- _last_error.setLastError("'" + alias + "': " + excpt.asUserString());
+ _last_error.setLastError("'" + alias + "': " + ExceptionAsString(excpt));
success = false;
// FIXME ??
@@ -2495,7 +2526,7 @@
}
unsigned int size_end = zypp_ptr()->pool().size();
- y2milestone("Pool size at end: %d (loaded %d resolvables)", size_end, size_start - size_end);
+ y2milestone("Pool size at end: %d (loaded %d resolvables)", size_end, size_end - size_start);
return success;
}
@@ -2547,7 +2578,7 @@
}
catch (const zypp::Exception& excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
y2error( "Cannot detect the repository type" );
return YCPVoid();
}
@@ -2577,7 +2608,7 @@
}
catch ( const zypp::Exception& excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
y2error( "Cannot read the product list from the media" );
return YCPList();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.42/src/Target.cc new/yast2-pkg-bindings-2.15.43/src/Target.cc
--- old/yast2-pkg-bindings-2.15.42/src/Target.cc 2007-07-16 13:05:37.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/src/Target.cc 2007-08-15 13:32:01.000000000 +0200
@@ -64,7 +64,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetInit has failed: %s", excpt.msg().c_str() );
return YCPError(excpt.msg().c_str(), YCPBoolean(false));
}
@@ -92,7 +92,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetInit has failed: %s", excpt.msg().c_str() );
return YCPError(excpt.msg().c_str(), YCPBoolean(false));
}
@@ -117,7 +117,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetLoad has failed: %s", excpt.msg().c_str() );
return YCPError(excpt.msg().c_str(), YCPBoolean(false));
}
@@ -152,7 +152,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetDisableSources has failed: %s", excpt.msg().c_str() );
return YCPBoolean(false);
}
@@ -176,7 +176,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetFinish has failed: %s", excpt.msg().c_str() );
return YCPBoolean(false);
}
@@ -206,7 +206,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetInstall has failed: %s", excpt.asString().c_str());
return YCPBoolean(false);
}
@@ -235,7 +235,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetRemove has failed: %s", excpt.asString().c_str());
return YCPBoolean(false);
}
@@ -260,7 +260,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetLogfile has failed: %s", excpt.asString().c_str());
return YCPBoolean(false);
}
@@ -463,7 +463,7 @@
}
catch (zypp::Exception & excpt)
{
- _last_error.setLastError(excpt.asUserString());
+ _last_error.setLastError(ExceptionAsString(excpt));
ycperror("TargetRebuildDB has failed: %s", excpt.msg().c_str() );
return YCPBoolean(false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.42/VERSION new/yast2-pkg-bindings-2.15.43/VERSION
--- old/yast2-pkg-bindings-2.15.42/VERSION 2007-08-09 10:18:28.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.43/VERSION 2007-08-16 14:25:21.000000000 +0200
@@ -1 +1 @@
-2.15.42
+2.15.43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org