Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu Nov 23 16:59:59 CET 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-11-20 11:29:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-11-22 13:58:23.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Nov 22 13:49:31 CET 2006 - lslezak@suse.cz
+
+- provide installation summary about packages from a YUM
+ source (medium number is 0) (#220242)
+- 2.14.4
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.14.3.tar.bz2
New:
----
yast2-pkg-bindings-2.14.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.Nja92I/_old 2006-11-23 16:58:34.000000000 +0100
+++ /var/tmp/diff_new_pack.Nja92I/_new 2006-11-23 16:58:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.14.3)
+# spec file for package yast2-pkg-bindings (Version 2.14.4)
#
# Copyright (c) 2006 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.14.3
+Version: 2.14.4
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.14.3.tar.bz2
+Source0: yast2-pkg-bindings-2.14.4.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.14.3
+%setup -n yast2-pkg-bindings-2.14.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,10 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Wed Nov 22 2006 - lslezak@suse.cz
+- provide installation summary about packages from a YUM
+ source (medium number is 0) (#220242)
+- 2.14.4
* Mon Nov 20 2006 - lslezak@suse.cz
- fixed SourceStartManager(): load sources even if some source
could not have been restored (#221071)
++++++ yast2-pkg-bindings-2.14.3.tar.bz2 -> yast2-pkg-bindings-2.14.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.3/VERSION new/yast2-pkg-bindings-2.14.4/VERSION
--- old/yast2-pkg-bindings-2.14.3/VERSION 2006-11-20 11:16:34.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.4/VERSION 2006-11-22 13:54:50.000000000 +0100
@@ -1 +1 @@
-2.14.3
+2.14.4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.3/configure new/yast2-pkg-bindings-2.14.4/configure
--- old/yast2-pkg-bindings-2.14.3/configure 2006-11-20 11:28:47.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.4/configure 2006-11-22 13:56:25.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.14.3.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.14.4.
#
# 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.14.3'
-PACKAGE_STRING='yast2-pkg-bindings 2.14.3'
+PACKAGE_VERSION='2.14.4'
+PACKAGE_STRING='yast2-pkg-bindings 2.14.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1428,7 +1428,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.14.3 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.14.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1499,7 +1499,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.14.3:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.14.4:";;
esac
cat <<\_ACEOF
@@ -1607,7 +1607,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.14.3
+yast2-pkg-bindings configure 2.14.4
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1621,7 +1621,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.14.3, which was
+It was created by yast2-pkg-bindings $as_me 2.14.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2422,7 +2422,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.14.3'
+ VERSION='2.14.4'
cat >>confdefs.h <<_ACEOF
@@ -2649,7 +2649,7 @@
-VERSION="2.14.3"
+VERSION="2.14.4"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -21609,7 +21609,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.14.3, which was
+This file was extended by yast2-pkg-bindings $as_me 2.14.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21662,7 +21662,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.14.3
+yast2-pkg-bindings config.status 2.14.4
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.14.3/configure.in new/yast2-pkg-bindings-2.14.4/configure.in
--- old/yast2-pkg-bindings-2.14.3/configure.in 2006-11-20 11:28:33.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.4/configure.in 2006-11-22 13:56:10.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.14.3, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.14.4, 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.14.3"
+VERSION="2.14.4"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.3/src/Package.cc new/yast2-pkg-bindings-2.14.4/src/Package.cc
--- old/yast2-pkg-bindings-2.14.3/src/Package.cc 2006-11-13 09:59:59.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.4/src/Package.cc 2006-11-22 12:43:53.000000000 +0100
@@ -288,7 +288,6 @@
unsigned media = src.numberOfMedia();
result[id] = std::vectorzypp::ByteCount(media,0);
-
source_map[ src ] = id;
}
@@ -298,11 +297,20 @@
{
zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(it->resolvable());
- if( it->status().isToBeInstalled() && pkg->sourceMediaNr() > 0)
+ if( it->status().isToBeInstalled())
{
- zypp::ByteCount size = pkg->size();
- result[ source_map[pkg->source()] ]
- [pkg->sourceMediaNr()-1] += size ; // media are numbered from 1
+ unsigned int medium = pkg->sourceMediaNr();
+ if (medium == 0)
+ {
+ medium = 1;
+ }
+
+ if (medium > 0)
+ {
+ zypp::ByteCount size = pkg->size();
+ result[ source_map[pkg->source()] ]
+ [medium - 1] += size ; // media are numbered from 1
+ }
}
}
@@ -373,9 +381,20 @@
{
zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(it->resolvable());
- if( pkg && it->status().isToBeInstalled() && pkg->sourceMediaNr() > 0)
- result[ source_map[pkg->source()] ]
- [pkg->sourceMediaNr()-1]++ ; // media are numbered from 1
+ if( pkg && it->status().isToBeInstalled())
+ {
+ unsigned int medium = pkg->sourceMediaNr();
+ if (medium == 0)
+ {
+ medium = 1;
+ }
+
+ if (pkg->sourceMediaNr() > 0)
+ {
+ result[ source_map[pkg->source()] ]
+ [medium - 1]++ ; // media are numbered from 1
+ }
+ }
}
YCPList res;
@@ -989,8 +1008,7 @@
data->add( YCPString("arch"), YCPString( pkg->arch().asString() ) );
data->add( YCPString("medianr"), YCPInteger( pkg->sourceMediaNr() ) );
- y2internal("getting the ID...");
- y2internal("srcId: %ld", pkg->source().numericId() );
+ y2debug("srcId: %ld", pkg->source().numericId() );
data->add( YCPString("srcid"), YCPInteger( pkg->source().numericId() ) );
std::string status("available");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.14.3/src/PkgModuleFunctions.cc new/yast2-pkg-bindings-2.14.4/src/PkgModuleFunctions.cc
--- old/yast2-pkg-bindings-2.14.3/src/PkgModuleFunctions.cc 2006-11-16 13:48:17.000000000 +0100
+++ new/yast2-pkg-bindings-2.14.4/src/PkgModuleFunctions.cc 2006-11-22 12:45:02.000000000 +0100
@@ -141,11 +141,11 @@
}
catch (const std::exception& excpt)
{
- y2internal("Catched unhandled exception: %s", excpt.what());
+ y2internal("Caught an unhandled exception: %s", excpt.what());
}
catch (...)
{
- y2internal("Catched unhandled exception");
+ y2internal("Caught an unhandled exception");
}
return YCPNull ();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org