Hello community,
here is the log from the commit of package libzypp-testsuite-tools for
openSUSE:Factory checked in at 2015-08-12 15:10:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-07-22 09:19:43.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libzypp-testsuite-tools.new/libzypp-testsuite-tools.changes
2015-08-12 15:10:50.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jul 30 18:17:13 CEST 2015 - [email protected]
+
+- Add requested locales and autoinstalled packages.
+- version 5.0.2
+
+-------------------------------------------------------------------
Old:
----
zypp-testsuite-tools-5.0.1.tar.bz2
New:
----
zypp-testsuite-tools-5.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-testsuite-tools.spec ++++++
--- /var/tmp/diff_new_pack.dotkmp/_old 2015-08-12 15:10:50.000000000 +0200
+++ /var/tmp/diff_new_pack.dotkmp/_new 2015-08-12 15:10:50.000000000 +0200
@@ -21,14 +21,14 @@
BuildRequires: gcc-c++ >= 4.6
BuildRequires: libexpat-devel
BuildRequires: libtool
-BuildRequires: libzypp-devel >= 14.28.0
+BuildRequires: libzypp-devel >= 15.10.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management -
testsuite-tools
License: GPL-2.0
Group: System/Packages
-Version: 5.0.1
+Version: 5.0.2
Release: 0
-Source: zypp-testsuite-tools-5.0.1.tar.bz2
+Source: zypp-testsuite-tools-5.0.2.tar.bz2
%description
Package, Patch, Pattern, and Product Management - testsuite-tools
@@ -45,7 +45,7 @@
Ladislav Slezak <[email protected]>
%prep
-%setup -q -n zypp-testsuite-tools-5.0.1
+%setup -q -n zypp-testsuite-tools-5.0.2
%build
mv configure.ac x
++++++ zypp-testsuite-tools-5.0.1.tar.bz2 -> zypp-testsuite-tools-5.0.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zypp-testsuite-tools-5.0.1/VERSION
new/zypp-testsuite-tools-5.0.2/VERSION
--- old/zypp-testsuite-tools-5.0.1/VERSION 2015-07-09 16:59:15.000000000
+0200
+++ new/zypp-testsuite-tools-5.0.2/VERSION 2015-07-30 18:20:28.000000000
+0200
@@ -49,5 +49,5 @@
m4_define([LIBZYPPTESTSUITE_MINOR], [0])
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-5.0.1/configure
new/zypp-testsuite-tools-5.0.2/configure
--- old/zypp-testsuite-tools-5.0.1/configure 2015-07-13 12:17:24.000000000
+0200
+++ new/zypp-testsuite-tools-5.0.2/configure 2015-07-30 18:20:38.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 5.0.1.
+# Generated by GNU Autoconf 2.69 for zypp-testsuite-tools 5.0.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='5.0.1'
-PACKAGE_STRING='zypp-testsuite-tools 5.0.1'
+PACKAGE_VERSION='5.0.2'
+PACKAGE_STRING='zypp-testsuite-tools 5.0.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1330,7 +1330,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 5.0.1 to adapt to many kinds of
systems.
+\`configure' configures zypp-testsuite-tools 5.0.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1402,7 +1402,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of zypp-testsuite-tools 5.0.1:";;
+ short | recursive ) echo "Configuration of zypp-testsuite-tools 5.0.2:";;
esac
cat <<\_ACEOF
@@ -1516,7 +1516,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-zypp-testsuite-tools configure 5.0.1
+zypp-testsuite-tools configure 5.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1915,7 +1915,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 5.0.1, which was
+It was created by zypp-testsuite-tools $as_me 5.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2891,7 +2891,7 @@
# Define the identity of the package.
PACKAGE='zypp-testsuite-tools'
- VERSION='5.0.1'
+ VERSION='5.0.2'
cat >>confdefs.h <<_ACEOF
@@ -17154,7 +17154,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 5.0.1, which was
+This file was extended by zypp-testsuite-tools $as_me 5.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17220,7 +17220,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 5.0.1
+zypp-testsuite-tools config.status 5.0.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-5.0.1/libzypp-testsuite-tools.spec.in
new/zypp-testsuite-tools-5.0.2/libzypp-testsuite-tools.spec.in
--- old/zypp-testsuite-tools-5.0.1/libzypp-testsuite-tools.spec.in
2015-07-06 11:53:01.000000000 +0200
+++ new/zypp-testsuite-tools-5.0.2/libzypp-testsuite-tools.spec.in
2015-07-20 14:00:45.000000000 +0200
@@ -18,7 +18,7 @@
Name: libzypp-testsuite-tools
BuildRequires: fdupes libexpat-devel
BuildRequires: gcc-c++ >= 4.6
-BuildRequires: libzypp-devel >= 14.28.0
+BuildRequires: libzypp-devel >= 15.10.0
BuildRequires: libtool
License: GPL-2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/zypp-testsuite-tools-5.0.1/src/deptestomatic.cc
new/zypp-testsuite-tools-5.0.2/src/deptestomatic.cc
--- old/zypp-testsuite-tools-5.0.1/src/deptestomatic.cc 2015-07-13
12:17:13.000000000 +0200
+++ new/zypp-testsuite-tools-5.0.2/src/deptestomatic.cc 2015-07-30
16:05:28.000000000 +0200
@@ -59,6 +59,7 @@
#include "zypp/base/LogControl.h"
#include "zypp/base/Exception.h"
#include "zypp/base/Algorithm.h"
+#include "zypp/base/SetTracker.h"
#include "zypp/ui/Selectable.h"
@@ -68,13 +69,15 @@
#include "zypp/solver/detail/Resolver.h"
#include "zypp/solver/detail/Testcase.h"
+#include "zypp/solver/detail/SystemCheck.h"
+
+#include "zypp/solver/detail/ItemCapKind.h"
#include "zypp/solver/detail/SolverQueueItem.h"
#include "zypp/solver/detail/SolverQueueItemDelete.h"
#include "zypp/solver/detail/SolverQueueItemInstall.h"
#include "zypp/solver/detail/SolverQueueItemInstallOneOf.h"
#include "zypp/solver/detail/SolverQueueItemLock.h"
#include "zypp/solver/detail/SolverQueueItemUpdate.h"
-#include "zypp/solver/detail/SystemCheck.h"
#include "zypp/target/modalias/Modalias.h"
@@ -90,18 +93,14 @@
using zypp::solver::detail::XmlNode_Ptr;
//-----------------------------------------------------------------------------
-namespace zypp {
- namespace solver {
- namespace detail {
- typedef shared_ptr<Resolver> MyResolver_Ptr;
- }
- }
-}
+typedef zypp::shared_ptr<zypp::solver::detail::ResolverInternal>
MyResolver_Ptr;
+//-----------------------------------------------------------------------------
static bool show_mediaid = false;
static Pathname globalPath;
-static LocaleSet locales;
+static base::SetTracker<LocaleSet> localesTracker;
+static sat::StringQueue autoinstalled;
static target::Modalias::ModaliasList modaliasList;
static std::set<std::string> multiversionSpec;
@@ -340,7 +339,7 @@
return;
}
-static void print_problems( zypp::solver::detail::MyResolver_Ptr resolver )
+static void print_problems( MyResolver_Ptr resolver )
{
ResolverProblemList problems = resolver->problems();
problems.sort( compare_problems() );
@@ -539,7 +538,7 @@
// collect all installed items in a set
void
-print_pool( zypp::solver::detail::MyResolver_Ptr resolver, const string &
prefix = "", bool show_all = true, string show_licence = "false", bool verbose
= false )
+print_pool( MyResolver_Ptr resolver, const string & prefix = "", bool show_all
= true, string show_licence = "false", bool verbose = false )
{
SortItem info( show_all );
cout << "Current pool: " << God->pool().size() << endl;
@@ -566,7 +565,7 @@
cout << " will be selected by:" << endl;
}
cout << prefix << ++count << ": ";
- cout << " " << iter->item << " " << iter->cap << " "
<< iter->capKind << " " << iter->initialInstallation << endl;
+ cout << " " << iter->item() << " " << iter->cap() << "
" << iter->capKind() << " " << iter->initialInstallation() << endl;
}
for (zypp::solver::detail::ItemCapKindList::const_iterator iter =
select.begin(); iter != select.end(); ++iter) {
if (iter == select.begin()) {
@@ -574,7 +573,7 @@
cout << " will select:" << endl;
}
cout << prefix << ++count << ": ";
- cout << " " << iter->item << " " << iter->cap << " "
<< iter->capKind << " " << iter->initialInstallation << endl;
+ cout << " " << iter->item() << " " << iter->cap() << "
" << iter->capKind() << " " << iter->initialInstallation() << endl;
}
}
}
@@ -816,17 +815,32 @@
}
else if ( node->equals("locale") )
{
- string loc = node->getProp("name");
- if ( loc.empty() )
+ Locale loc( node->getProp("name") );
+ string fate = node->getProp("fate");
+ if ( !loc )
{
cerr << "Bad or missing name in <locale...>" << endl;
}
+ else if ( fate == "added" )
+ {
+ RESULT << "Requesting locale " << loc << " (added)" << endl;
+ localesTracker.added().insert( loc );
+ }
+ else if ( fate == "removed" )
+ {
+ RESULT << "Requesting locale " << loc << " (removed)" << endl;
+ localesTracker.removed().insert( loc );
+ }
else
{
RESULT << "Requesting locale " << loc << endl;
- locales.insert( Locale( loc ) );
+ localesTracker.current().insert( loc );
}
}
+ else if ( node->equals("autoinst") )
+ {
+ autoinstalled.push( IdString( node->getProp("name") ).id() );
+ }
else if ( node->equals("systemCheck") )
{
Pathname pathname = globalPath + node->getProp("path");
@@ -882,18 +896,27 @@
sat::Pool satpool( sat::Pool::instance() );
- zypp::solver::detail::MyResolver_Ptr resolver( new
zypp::solver::detail::Resolver( pool ) );
+ MyResolver_Ptr resolver( new zypp::solver::detail::ResolverInternal( pool
) );
resolver->setForceResolve( forceResolve );
resolver->setIgnoreAlreadyRecommended( ignorealreadyrecommended );
resolver->setOnlyRequires( onlyRequires );
if ( allowVendorChange )
resolver->setAllowVendorChange( true );
- if ( !locales.empty() )
+ // RequestedLocales
{
- pool.setRequestedLocales( locales );
+ localesTracker.removed().insert( localesTracker.current().begin(),
localesTracker.current().end() );
+ zypp::sat::Pool::instance().initRequestedLocales(
localesTracker.removed() );
+ RESULT << "initRequestedLocales " << localesTracker.removed() << endl;
+
+ localesTracker.added().insert( localesTracker.current().begin(),
localesTracker.current().end() );
+ zypp::sat::Pool::instance().setRequestedLocales( localesTracker.added()
);
+ RESULT << "setRequestedLocales " << localesTracker.added() << endl;
}
+ // AutoInstalled
+ zypp::sat::Pool::instance().setAutoInstalled( autoinstalled );
+
// set modaliases
RESULT << "Load " << modaliasList.size() << " modaliases." << endl;
target::Modalias::instance().modaliasList( modaliasList );
