Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Mon Sep 3 18:48:45 CEST 2007.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-08-31 11:38:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-09-03 13:05:18.311731000 +0200
@@ -1,0 +2,7 @@
+Mon Sep 3 13:01:12 CEST 2007 - lslezak@suse.cz
+
+- reimplemented media redirection in media change callback
+ (#294481)
+- 2.15.49
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.15.48.tar.bz2
New:
----
yast2-pkg-bindings-2.15.49.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.c12968/_old 2007-09-03 18:48:08.000000000 +0200
+++ /var/tmp/diff_new_pack.c12968/_new 2007-09-03 18:48:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.48)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.15.49)
#
# 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.48
+Version: 2.15.49
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.15.48.tar.bz2
+Source0: yast2-pkg-bindings-2.15.49.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.48
+%setup -n yast2-pkg-bindings-2.15.49
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.c12968/_old 2007-09-03 18:48:08.000000000 +0200
+++ /var/tmp/diff_new_pack.c12968/_new 2007-09-03 18:48:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.15.48)
+# spec file for package yast2-pkg-bindings (Version 2.15.49)
#
# 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.48
+Version: 2.15.49
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.15.48.tar.bz2
+Source0: yast2-pkg-bindings-2.15.49.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.21.0
@@ -40,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.15.48
+%setup -n yast2-pkg-bindings-2.15.49
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Mon Sep 03 2007 - lslezak@suse.cz
+- reimplemented media redirection in media change callback
+ (#294481)
+- 2.15.49
* Fri Aug 31 2007 - lslezak@suse.cz
- fixed inverted result of PkgAvailable() and PkgInstalled()
- 2.15.48
++++++ yast2-pkg-bindings-2.15.48.tar.bz2 -> yast2-pkg-bindings-2.15.49.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.48/configure new/yast2-pkg-bindings-2.15.49/configure
--- old/yast2-pkg-bindings-2.15.48/configure 2007-08-31 11:37:11.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.49/configure 2007-09-03 13:04:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.15.48.
+# Generated by GNU Autoconf 2.61 for yast2-pkg-bindings 2.15.49.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.15.48'
-PACKAGE_STRING='yast2-pkg-bindings 2.15.48'
+PACKAGE_VERSION='2.15.49'
+PACKAGE_STRING='yast2-pkg-bindings 2.15.49'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1447,7 +1447,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.48 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.15.49 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1518,7 +1518,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.48:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.49:";;
esac
cat <<\_ACEOF
@@ -1627,7 +1627,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.15.48
+yast2-pkg-bindings configure 2.15.49
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1641,7 +1641,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.48, which was
+It was created by yast2-pkg-bindings $as_me 2.15.49, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2462,7 +2462,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.15.48'
+ VERSION='2.15.49'
cat >>confdefs.h <<_ACEOF
@@ -2689,7 +2689,7 @@
-VERSION="2.15.48"
+VERSION="2.15.49"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -21198,7 +21198,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.48, which was
+This file was extended by yast2-pkg-bindings $as_me 2.15.49, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21251,7 +21251,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.15.48
+yast2-pkg-bindings config.status 2.15.49
configured by $0, generated by GNU Autoconf 2.61,
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.48/configure.in new/yast2-pkg-bindings-2.15.49/configure.in
--- old/yast2-pkg-bindings-2.15.48/configure.in 2007-08-31 11:36:58.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.49/configure.in 2007-09-03 13:04:24.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.15.48, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.15.49, 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.48"
+VERSION="2.15.49"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.48/src/Callbacks.cc new/yast2-pkg-bindings-2.15.49/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.15.48/src/Callbacks.cc 2007-08-30 19:47:39.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.49/src/Callbacks.cc 2007-09-03 12:48:27.000000000 +0200
@@ -43,7 +43,11 @@
// remember redirected URLs
// FIXME huh?
-std::map > redirect_map;
+
+typedef std::map MediaMap;
+typedef std::map RedirectMap;
+
+RedirectMap redirect_map;
///////////////////////////////////////////////////////////////////
namespace ZyppRecipients {
@@ -1009,14 +1013,14 @@
callback.addStr( description );
// search URL in the redirection map
- std::map >::const_iterator source_it = redirect_map.find(url);
+ RedirectMap::const_iterator source_it = redirect_map.find(url);
bool found = false;
- std::string report_url;
+ zypp::Url report_url;
if (source_it != redirect_map.end())
{
// search medium in the redirection map
- std::map::const_iterator media_it = (*source_it).second.find(mediumNr);
+ MediaMap::const_iterator media_it = (*source_it).second.find(mediumNr);
if (media_it != (*source_it).second.end())
{
@@ -1025,7 +1029,7 @@
// report the redirected URL
report_url = (*media_it).second;
- y2milestone("Using redirected URL %s, original URL: %s", report_url.c_str(), url.asString().c_str());
+ y2milestone("Using redirected URL %s, original URL: %s", report_url.asString().c_str(), url.asString().c_str());
}
}
@@ -1033,11 +1037,11 @@
{
// the source has not been redirected
// use URL of the source
- report_url = url.asString();
+ report_url = url;
}
// current URL
- callback.addStr( report_url );
+ callback.addStr( report_url.asString() );
// current product name (use the alias, see #214886)
callback.addStr( std::string() /*FIXME*/ );
@@ -1077,15 +1081,12 @@
// otherwise change media URL
// try/catch to catch invalid URLs
try {
- // FIXME set the new URL
- zypp::Url ret_url (ret);
-#warning FIXME: MediaChange callback - redirection is missing!
- y2internal("Source redirection is not yet implemented in yast2-pkg-bindings");
- //source.redirect( mediumNr, ret_url );
+ // set the new URL
+ url = zypp::Url(ret);
// remember the redirection
- std::map source_redir = redirect_map[url];
- source_redir[mediumNr] = ret;
+ MediaMap source_redir = redirect_map[url];
+ source_redir[mediumNr] = url;
redirect_map[url] = source_redir;
y2milestone("Source redirected to %s", ret.c_str());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.48/VERSION new/yast2-pkg-bindings-2.15.49/VERSION
--- old/yast2-pkg-bindings-2.15.48/VERSION 2007-08-31 11:28:43.000000000 +0200
+++ new/yast2-pkg-bindings-2.15.49/VERSION 2007-09-03 13:01:01.000000000 +0200
@@ -1 +1 @@
-2.15.48
+2.15.49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org