Hello community,
here is the log from the commit of package libzypp-testsuite-tools for
openSUSE:Factory checked in at 2013-05-27 09:53:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp-testsuite-tools (Old)
and /work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp-testsuite-tools"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libzypp-testsuite-tools/libzypp-testsuite-tools.changes
2013-03-08 09:22:26.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new/libzypp-testsuite-tools.changes
2013-05-27 09:53:39.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 8 19:44:07 CEST 2013 - m...@suse.de
+
+- Remove deprecated installorder code
+- version 4.3.2
+
+-------------------------------------------------------------------
Old:
----
zypp-testsuite-tools-4.3.1.tar.bz2
New:
----
zypp-testsuite-tools-4.3.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-testsuite-tools.spec ++++++
--- /var/tmp/diff_new_pack.ml7bU4/_old 2013-05-27 09:53:40.000000000 +0200
+++ /var/tmp/diff_new_pack.ml7bU4/_new 2013-05-27 09:53:40.000000000 +0200
@@ -18,7 +18,7 @@
Name: libzypp-testsuite-tools
BuildRequires: fdupes libexpat-devel libqt4-devel libqdialogsolver1-devel
BuildRequires: gcc-c++ >= 4.5
-BuildRequires: libzypp-devel >= 6.10.0
+BuildRequires: libzypp-devel >= 13.2.0
BuildRequires: libtool
%if 0%{?suse_version} <= 1220
BuildRequires: yast2-libyui-devel
@@ -28,9 +28,9 @@
License: GPL-2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management -
testsuite-tools
-Version: 4.3.1
+Version: 4.3.2
Release: 0
-Source: zypp-testsuite-tools-4.3.1.tar.bz2
+Source: zypp-testsuite-tools-4.3.2.tar.bz2
Group: System/Packages
%description
@@ -48,7 +48,7 @@
Ladislav Slezak <lsle...@suse.cz>
%prep
-%setup -q -n zypp-testsuite-tools-4.3.1
+%setup -q -n zypp-testsuite-tools-4.3.2
%build
mv configure.ac x
++++++ zypp-testsuite-tools-4.3.1.tar.bz2 -> zypp-testsuite-tools-4.3.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zypp-testsuite-tools-4.3.1/VERSION
new/zypp-testsuite-tools-4.3.2/VERSION
--- old/zypp-testsuite-tools-4.3.1/VERSION 2013-01-09 14:15:51.000000000
+0100
+++ new/zypp-testsuite-tools-4.3.2/VERSION 2013-05-08 19:51:28.000000000
+0200
@@ -49,5 +49,5 @@
m4_define([LIBZYPPTESTSUITE_MINOR], [3])
m4_define([LIBZYPPTESTSUITE_COMPATMINOR], [0])
dnl ==================================================
-m4_define([LIBZYPPTESTSUITE_PATCH], [1])
+m4_define([LIBZYPPTESTSUITE_PATCH], [2])
dnl ==================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zypp-testsuite-tools-4.3.1/configure
new/zypp-testsuite-tools-4.3.2/configure
--- old/zypp-testsuite-tools-4.3.1/configure 2013-01-09 14:16:06.000000000
+0100
+++ new/zypp-testsuite-tools-4.3.2/configure 2013-05-10 11:56:45.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for zypp-testsuite-tools 4.3.1.
+# Generated by GNU Autoconf 2.69 for zypp-testsuite-tools 4.3.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='zypp-testsuite-tools'
PACKAGE_TARNAME='zypp-testsuite-tools'
-PACKAGE_VERSION='4.3.1'
-PACKAGE_STRING='zypp-testsuite-tools 4.3.1'
+PACKAGE_VERSION='4.3.2'
+PACKAGE_STRING='zypp-testsuite-tools 4.3.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1326,7 +1326,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 zypp-testsuite-tools 4.3.1 to adapt to many kinds of
systems.
+\`configure' configures zypp-testsuite-tools 4.3.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of zypp-testsuite-tools 4.3.1:";;
+ short | recursive ) echo "Configuration of zypp-testsuite-tools 4.3.2:";;
esac
cat <<\_ACEOF
@@ -1507,7 +1507,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-zypp-testsuite-tools configure 4.3.1
+zypp-testsuite-tools configure 4.3.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1906,7 +1906,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by zypp-testsuite-tools $as_me 4.3.1, which was
+It was created by zypp-testsuite-tools $as_me 4.3.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2843,7 +2843,7 @@
# Define the identity of the package.
PACKAGE='zypp-testsuite-tools'
- VERSION='4.3.1'
+ VERSION='4.3.2'
cat >>confdefs.h <<_ACEOF
@@ -16375,7 +16375,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by zypp-testsuite-tools $as_me 4.3.1, which was
+This file was extended by zypp-testsuite-tools $as_me 4.3.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16441,7 +16441,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-zypp-testsuite-tools config.status 4.3.1
+zypp-testsuite-tools config.status 4.3.2
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/zypp-testsuite-tools-4.3.1/libzypp-testsuite-tools.spec.in
new/zypp-testsuite-tools-4.3.2/libzypp-testsuite-tools.spec.in
--- old/zypp-testsuite-tools-4.3.1/libzypp-testsuite-tools.spec.in
2012-12-18 16:11:22.000000000 +0100
+++ new/zypp-testsuite-tools-4.3.2/libzypp-testsuite-tools.spec.in
2013-05-08 19:51:28.000000000 +0200
@@ -18,7 +18,7 @@
Name: libzypp-testsuite-tools
BuildRequires: fdupes libexpat-devel libqt4-devel libqdialogsolver1-devel
BuildRequires: gcc-c++ >= 4.5
-BuildRequires: libzypp-devel >= 6.10.0
+BuildRequires: libzypp-devel >= 13.2.0
BuildRequires: libtool
%if 0%{?suse_version} <= 1220
BuildRequires: yast2-libyui-devel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zypp-testsuite-tools-4.3.1/src/deptestomatic.cc
new/zypp-testsuite-tools-4.3.2/src/deptestomatic.cc
--- old/zypp-testsuite-tools-4.3.1/src/deptestomatic.cc 2013-01-09
14:10:51.000000000 +0100
+++ new/zypp-testsuite-tools-4.3.2/src/deptestomatic.cc 2013-05-10
11:56:28.000000000 +0200
@@ -53,7 +53,7 @@
#include "zypp/ZConfig.h"
#include "zypp/base/String.h"
-#include "zypp/base/Logger.h"
+#include "zypp/base/LogTools.h"
#include "zypp/base/LogControl.h"
#include "zypp/base/Exception.h"
#include "zypp/base/Algorithm.h"
@@ -62,12 +62,9 @@
#include "zypp/media/MediaManager.h"
-#include "zypp/pool/GetResolvablesToInsDel.h"
-
#include "zypp/Repository.h"
#include "zypp/solver/detail/Resolver.h"
-#include "zypp/solver/detail/InstallOrder.h"
#include "zypp/solver/detail/Testcase.h"
#include "zypp/solver/detail/SolverQueueItem.h"
#include "zypp/solver/detail/SolverQueueItemDelete.h"
@@ -101,7 +98,6 @@
using namespace std;
using namespace zypp;
using zypp::ui::Selectable;
-using zypp::solver::detail::InstallOrder;
using zypp::solver::detail::Testcase;
using zypp::ResolverProblemList;
using zypp::solver::detail::XmlNode;
@@ -207,7 +203,7 @@
List of known tags. See http://en.opensuse.org/Libzypp/Testsuite_solver for
details: \n\
PkgUI YOU addConflict addQueueDelete addQueueInstall addQueueInstallOneOf
addQueueLock addQueueUpdate \n\
addRequire allowVendorChange arch availablelocales channel createTestcase
current distupgrade force-install \n\
- forceResolve graphic hardwareInfo ignorealreadyrecommended install instorder
keep locale lock mediaid mediaorder \n\
+ forceResolve graphic hardwareInfo ignorealreadyrecommended install instorder
keep locale lock mediaid \n\
onlyRequires reportproblems setlicencebit showpool showselectable source
subscribe system systemCheck \n\
takesolution uninstall update upgradeRepo validate verify whatprovides" <<
endl;
@@ -302,7 +298,7 @@
}
static void
-print_solution ( const ResPool & pool, bool instorder, bool mediaorder)
+print_solution ( const ResPool & pool, bool instorder)
{
PoolItemOrderSet install = uniquelyInstalled(pool);
PoolItemOrderSet uninstall = uniquelyUninstalled(pool);
@@ -326,57 +322,14 @@
if (instorder) {
cout << endl;
RESULT << "Installation Order:" << endl << endl;
- zypp::solver::detail::PoolItemSet dummy;
-
- zypp::solver::detail::PoolItemSet insset( install.begin(),
install.end() );
-
- int counter = 1;
- InstallOrder order( pool, insset, dummy ); // sort
according to prereq
- order.init();
- for ( zypp::solver::detail::PoolItemList items =
order.computeNextSet(); ! items.empty(); items = order.computeNextSet() )
- {
- RESULT << endl;
- RESULT << counter << ". set with " << items.size() << "
resolvables" << endl;
- PoolItemOrderSet orderedset;
-
- for ( zypp::solver::detail::PoolItemList::iterator iter =
items.begin(); iter != items.end(); ++iter )
- {
- orderedset.insert( *iter );
- }
- for (PoolItemOrderSet::const_iterator iter = orderedset.begin();
iter != orderedset.end(); iter++) {
- RESULT; printRes( cout, *iter); cout << endl;
- }
- counter++;
- order.setInstalled( items );
- }
+ sat::Transaction trans( sat::Transaction::loadFromPool );
+ trans.order();
+ RESULT << dump(trans) << endl;
cout << "- - - - - - - - - -" << endl;
}
- if (mediaorder) {
- cout << endl;
- RESULT << "Media Order:" << endl << endl;
-
- Target::PoolItemList dellist;
- Target::PoolItemList inslist;
- Target::PoolItemList srclist;
- pool::GetResolvablesToInsDel collect( pool );
- dellist.swap(collect._toDelete);
- inslist.swap(collect._toInstall);
- srclist.swap(collect._toSrcinstall);
-
- int count = 0;
- for (Target::PoolItemList::const_iterator iter = dellist.begin(); iter
!= dellist.end(); iter++) {
- cout << "DEL " << ++count << ".: "; printRes (cout, (*iter)); cout
<< endl;
- }
- count = 0;
- for (Target::PoolItemList::const_iterator iter = inslist.begin(); iter
!= inslist.end(); iter++) {
- cout << "INS " << ++count << ".:"; printRes (cout, (*iter)); cout
<< endl;
- }
- cout << "- - - - - - - - - -" << endl;
- }
-
cout.flush();
return;
@@ -857,7 +810,6 @@
bool verify = false;
bool doUpdate = false;
bool instorder = false;
- bool mediaorder = false;
if (!node->equals ("trial")) {
ZYPP_THROW (Exception ("Node not 'trial' in parse_xml_trial()"));
@@ -983,21 +935,15 @@
RESULT << "Doing update ..." << endl;
resolver->doUpdate();
- print_solution (pool, instorder, mediaorder);
+ print_solution (pool, instorder);
doUpdate = true;
- } else if (node->equals ("instorder")) {
+ } else if (node->equals ("instorder") || node->equals
("mediaorder")/*legacy*/) {
RESULT << "Calculating installation order ..." << endl;
instorder = true;
- } else if (node->equals ("mediaorder")) {
-
- RESULT << "Calculating media installation order ..." << endl;
-
- mediaorder = true;
-
} else if (node->equals ("whatprovides")) {
string kind_name = node->getProp ("kind");
@@ -1410,7 +1356,7 @@
success = resolver->resolvePool();
}
if (success) {
- print_solution (pool, instorder, mediaorder);
+ print_solution (pool, instorder);
} else {
RESULT << "No valid solution found." << endl;
print_problems( resolver );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
