Hello community,
here is the log from the commit of package yast2-pkg-bindings for
openSUSE:Factory checked in at 2013-06-05 13:26:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old)
and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-pkg-bindings"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes
2013-01-29 07:08:22.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes
2013-06-05 13:26:31.000000000 +0200
@@ -1,0 +2,11 @@
+Wed May 22 13:00:04 UTC 2013 - [email protected]
+
+- removed logging from finishParameters() function
+- 2.24.0
+
+-------------------------------------------------------------------
+Wed May 15 17:59:37 CEST 2013 - [email protected]
+
+- No longer use deprecated zypp API methods.
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.23.1.tar.bz2
New:
----
yast2-pkg-bindings-2.24.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.DWDOSn/_old 2013-06-05 13:26:32.000000000 +0200
+++ /var/tmp/diff_new_pack.DWDOSn/_new 2013-06-05 13:26:32.000000000 +0200
@@ -18,10 +18,10 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 2.23.1
+Version: 2.24.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.23.1.tar.bz2
+Source0: yast2-pkg-bindings-2.24.0.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.DWDOSn/_old 2013-06-05 13:26:32.000000000 +0200
+++ /var/tmp/diff_new_pack.DWDOSn/_new 2013-06-05 13:26:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-pkg-bindings
-Version: 2.23.1
+Version: 2.24.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-pkg-bindings-2.23.1.tar.bz2 -> yast2-pkg-bindings-2.24.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.23.1/Makefile.am
new/yast2-pkg-bindings-2.24.0/Makefile.am
--- old/yast2-pkg-bindings-2.23.1/Makefile.am 2013-01-28 12:46:49.000000000
+0100
+++ new/yast2-pkg-bindings-2.24.0/Makefile.am 2013-05-22 15:06:42.000000000
+0200
@@ -158,19 +158,14 @@
TAGVERSION = $(Y2TOOL) tagversion
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.23.1/Makefile.in
new/yast2-pkg-bindings-2.24.0/Makefile.in
--- old/yast2-pkg-bindings-2.23.1/Makefile.in 2013-01-28 12:47:02.000000000
+0100
+++ new/yast2-pkg-bindings-2.24.0/Makefile.in 2013-05-22 15:06:53.000000000
+0200
@@ -1069,19 +1069,14 @@
package: check-up-to-date check-tagversion check-textdomain package-local
-check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
- if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\
- else \
- cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep
-v '^Status against revision' ;\
+# check if there is no modified files and all commits were pushed
+check-up-to-date:
+ if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l`
-gt 0 ]; then \
+ (echo "ERROR: Source is not commited and pushed. See `git status`";
false) \
fi
check-tagversion:
- @if [ -d $(srcdir)/CVS ]; then \
- cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\
- else \
- cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \
- fi >/dev/null; \
+ cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \
[ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false )
check-parse-old:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.23.1/VERSION
new/yast2-pkg-bindings-2.24.0/VERSION
--- old/yast2-pkg-bindings-2.23.1/VERSION 2013-01-28 12:46:36.000000000
+0100
+++ new/yast2-pkg-bindings-2.24.0/VERSION 2013-05-22 15:06:34.000000000
+0200
@@ -1 +1 @@
-2.23.1
+2.24.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.23.1/configure
new/yast2-pkg-bindings-2.24.0/configure
--- old/yast2-pkg-bindings-2.23.1/configure 2013-01-28 12:47:01.000000000
+0100
+++ new/yast2-pkg-bindings-2.24.0/configure 2013-05-22 15:06:52.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for yast2-pkg-bindings 2.23.1.
+# Generated by GNU Autoconf 2.69 for yast2-pkg-bindings 2.24.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.23.1'
-PACKAGE_STRING='yast2-pkg-bindings 2.23.1'
+PACKAGE_VERSION='2.24.0'
+PACKAGE_STRING='yast2-pkg-bindings 2.24.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1384,7 +1384,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.23.1 to adapt to many kinds of
systems.
+\`configure' configures yast2-pkg-bindings 2.24.0 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1456,7 +1456,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.23.1:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.24.0:";;
esac
cat <<\_ACEOF
@@ -1576,7 +1576,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.23.1
+yast2-pkg-bindings configure 2.24.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2029,7 +2029,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.23.1, which was
+It was created by yast2-pkg-bindings $as_me 2.24.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2968,7 +2968,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.23.1'
+ VERSION='2.24.0'
cat >>confdefs.h <<_ACEOF
@@ -3091,7 +3091,7 @@
-VERSION="2.23.1"
+VERSION="2.24.0"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <[email protected]>"
@@ -16767,7 +16767,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.23.1, which was
+This file was extended by yast2-pkg-bindings $as_me 2.24.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16833,7 +16833,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.23.1
+yast2-pkg-bindings config.status 2.24.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.23.1/configure.in
new/yast2-pkg-bindings-2.24.0/configure.in
--- old/yast2-pkg-bindings-2.23.1/configure.in 2013-01-28 12:46:48.000000000
+0100
+++ new/yast2-pkg-bindings-2.24.0/configure.in 2013-05-22 15:06:42.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.23.1, http://bugs.opensuse.org/,
yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.24.0, http://bugs.opensuse.org/,
yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.23.1"
+VERSION="2.24.0"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.23.1/src/Package.cc
new/yast2-pkg-bindings-2.24.0/src/Package.cc
--- old/yast2-pkg-bindings-2.23.1/src/Package.cc 2013-01-22
11:47:22.000000000 +0100
+++ new/yast2-pkg-bindings-2.24.0/src/Package.cc 2013-05-21
14:14:59.000000000 +0200
@@ -1948,9 +1948,79 @@
return YCPVoid();
}
+namespace
+{
+ ///////////////////////////////////////////////////////////////////
+ /// \class OldStyleCommitResult
+ /// \brief Mimic deprecated old ZYppCommitResult API using plain data
members.
+ ///////////////////////////////////////////////////////////////////
+ struct OldStyleCommitResult
+ {
+ OldStyleCommitResult()
+ : _result( 0 )
+ {}
+
+ OldStyleCommitResult( const zypp::ZYppCommitResult & result_r )
+ : _result( 0 )
+ {
+ const zypp::ZYppCommitResult::TransactionStepList & steps(
result_r.transactionStepList() );
+ for_( step, steps.begin(), steps.end() )
+ {
+ if ( step->stepType() == zypp::sat::Transaction::TRANSACTION_IGNORE )
+ {
+ // For non-packages only products might have beed installed.
+ // All the rest is ignored.
+ if ( step->satSolvable().isSystem() || !
step->satSolvable().isKind<zypp::Product>() )
+ continue;
+ }
+ else if ( step->stepType() == zypp::sat::Transaction::TRANSACTION_ERASE
)
+ {
+ continue;
+ }
+ // to be installed:
+ switch ( step->stepStage() )
+ {
+ case zypp::sat::Transaction::STEP_TODO:
+ if ( step->satSolvable().isKind<zypp::Package>() )
+ _remaining.push_back( zypp::PoolItem( *step ) );
+ else if ( step->satSolvable().isKind<zypp::SrcPackage>() )
+ _srcremaining.push_back( zypp::PoolItem( *step ) );
+ break;
+ case zypp::sat::Transaction::STEP_DONE:
+ ++_result;
+ break;
+ case zypp::sat::Transaction::STEP_ERROR:
+ ++_result;
+ _errors.push_back( zypp::PoolItem( *step ) );
+ break;
+ }
+ }
+ }
+
+ typedef std::list<zypp::PoolItem> PoolItemList;
+ /**
+ * number of committed resolvables
+ **/
+ int _result;
+ /**
+ * list of resolvables with error
+ **/
+ PoolItemList _errors;
+ /**
+ * list of resolvables remaining (due to wrong media)
+ **/
+ PoolItemList _remaining;
+ /**
+ * list of kind:source resolvables remaining (due to wrong media)
+ **/
+ PoolItemList _srcremaining;
+ };
+ ///////////////////////////////////////////////////////////////////
+} // namespace
+
YCPValue PkgFunctions::CommitHelper(const zypp::ZYppCommitPolicy *policy)
{
- zypp::ZYpp::CommitResult result;
+ OldStyleCommitResult result;
// clean the last reported source
// DownloadResolvableReceive::last_source_id = -1;
@@ -1962,7 +2032,7 @@
last_reported_repo = -1;
last_reported_mediumnr = 1;
- result = zypp_ptr()->commit(*policy);
+ result = OldStyleCommitResult( zypp_ptr()->commit(*policy) );
}
catch (const zypp::target::TargetAbortedException & excpt)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-pkg-bindings-2.23.1/src/Y2PkgFunction.cc
new/yast2-pkg-bindings-2.24.0/src/Y2PkgFunction.cc
--- old/yast2-pkg-bindings-2.23.1/src/Y2PkgFunction.cc 2013-01-22
11:47:22.000000000 +0100
+++ new/yast2-pkg-bindings-2.24.0/src/Y2PkgFunction.cc 2013-05-22
15:06:34.000000000 +0200
@@ -102,7 +102,6 @@
bool Y2PkgFunction::finishParameters ()
{
- y2internal ("finishParameters not implemented");
return true;
}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
