Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Sat Aug 6 19:21:28 CEST 2011.
--------
--- libzypp/libzypp.changes 2011-07-28 13:20:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2011-08-05
15:34:30.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Aug 5 15:20:07 CEST 2011 - m...@suse.de
+
+- Attempt to fix smb mount entry comparison (bnc#710269)
+- version 9.10.1 (8)
+
+-------------------------------------------------------------------
+Thu Aug 4 14:54:47 CEST 2011 - m...@suse.de
+
+- Allow to turn Resolvers upgrade mode on and off (bnc#709480)
+- Fix reading of integer arrays from rpm headers (bnc#709716)
+- version 9.10.0 (8)
+
+-------------------------------------------------------------------
+Thu Aug 4 01:14:00 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-9.9.2.tar.bz2
New:
----
libzypp-9.10.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.ixbYij/_old 2011-08-06 19:20:43.000000000 +0200
+++ /var/tmp/diff_new_pack.ixbYij/_new 2011-08-06 19:20:43.000000000 +0200
@@ -23,7 +23,7 @@
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management
-Version: 9.9.2
+Version: 9.10.1
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
@@ -82,7 +82,7 @@
%endif
%endif
-%if 0%{?fedora_version}
+%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >=
600
BuildRequires: glib2-devel
BuildRequires: popt-devel
BuildRequires: rpm-devel
@@ -239,7 +239,7 @@
cd build
make install DESTDIR=$RPM_BUILD_ROOT
make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT
-%if 0%{?fedora_version}
+%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >=
600
ln -s %{_sysconfdir}/yum.repos.d $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
%else
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
@@ -332,7 +332,7 @@
%files -f zypp.lang
%defattr(-,root,root)
%dir %{_sysconfdir}/zypp
-%if 0%{?fedora_version}
+%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >=
600
%{_sysconfdir}/zypp/repos.d
%else
%dir %{_sysconfdir}/zypp/repos.d
++++++ libzypp-9.9.2.tar.bz2 -> libzypp-9.10.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/VERSION.cmake
new/libzypp-9.10.1/VERSION.cmake
--- old/libzypp-9.9.2/VERSION.cmake 2011-07-28 13:17:24.000000000 +0200
+++ new/libzypp-9.10.1/VERSION.cmake 2011-08-05 15:31:31.000000000 +0200
@@ -60,9 +60,9 @@
#
SET(LIBZYPP_MAJOR "9")
SET(LIBZYPP_COMPATMINOR "8")
-SET(LIBZYPP_MINOR "9")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_MINOR "10")
+SET(LIBZYPP_PATCH "1")
#
-# LAST RELEASED: 9.9.2 (8)
+# LAST RELEASED: 9.10.1 (8)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/libzypp.spec.cmake
new/libzypp-9.10.1/libzypp.spec.cmake
--- old/libzypp-9.9.2/libzypp.spec.cmake 2011-07-28 13:17:25.000000000
+0200
+++ new/libzypp-9.10.1/libzypp.spec.cmake 2011-08-05 15:31:31.000000000
+0200
@@ -74,7 +74,7 @@
%endif
%endif
-%if 0%{?fedora_version}
+%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >=
600
BuildRequires: glib2-devel
BuildRequires: popt-devel
BuildRequires: rpm-devel
@@ -230,7 +230,7 @@
cd build
make install DESTDIR=$RPM_BUILD_ROOT
make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT
-%if 0%{?fedora_version}
+%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >=
600
ln -s %{_sysconfdir}/yum.repos.d $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
%else
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zypp/repos.d
@@ -325,7 +325,7 @@
%files -f zypp.lang
%defattr(-,root,root)
%dir %{_sysconfdir}/zypp
-%if 0%{?fedora_version}
+%if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >=
600
%{_sysconfdir}/zypp/repos.d
%else
%dir %{_sysconfdir}/zypp/repos.d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/package/libzypp.changes
new/libzypp-9.10.1/package/libzypp.changes
--- old/libzypp-9.9.2/package/libzypp.changes 2011-07-28 13:17:24.000000000
+0200
+++ new/libzypp-9.10.1/package/libzypp.changes 2011-08-05 15:31:31.000000000
+0200
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Fri Aug 5 15:20:07 CEST 2011 - m...@suse.de
+
+- Attempt to fix smb mount entry comparison (bnc#710269)
+- version 9.10.1 (8)
+
+-------------------------------------------------------------------
+Thu Aug 4 14:54:47 CEST 2011 - m...@suse.de
+
+- Allow to turn Resolvers upgrade mode on and off (bnc#709480)
+- Fix reading of integer arrays from rpm headers (bnc#709716)
+- version 9.10.0 (8)
+
+-------------------------------------------------------------------
+Thu Aug 4 01:14:00 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
Thu Jul 28 13:04:10 CEST 2011 - m...@suse.de
- Evaluate CURLINFO_CONDITION_UNMET on zero sized successful transfers,
Files old/libzypp-9.9.2/po/zypp-po.tar.bz2 and
new/libzypp-9.10.1/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/tools/DumpSelectable.cc
new/libzypp-9.10.1/tools/DumpSelectable.cc
--- old/libzypp-9.9.2/tools/DumpSelectable.cc 2011-07-28 13:17:25.000000000
+0200
+++ new/libzypp-9.10.1/tools/DumpSelectable.cc 2011-08-05 15:31:31.000000000
+0200
@@ -4,6 +4,7 @@
#include <algorithm>
#include <zypp/PoolQuery.h>
+#include <zypp/ResObjects.h>
static std::string appname( "DumpSelectable" );
@@ -30,10 +31,23 @@
cerr << " Selectables names NAME" << endl;
cerr << " --root Load repos from the system located below ROOTDIR. If
ROOTDIR" << endl;
cerr << " denotes a sover testcase, the testcase is loaded." <<
endl;
+ cerr << " -v Verbose list solvables data." << endl;
cerr << "" << endl;
return exit_r;
}
+void dumpPi( std::ostream & message, const PoolItem & pi )
+{
+ std::string indent(" ");
+ message << indent << "--------------------------------------------------" <<
endl;
+ message << indent << (pi->isSystem() ? "i " : "a ") <<
pi->satSolvable().asString() << endl;
+ message << indent << pi->summary() << endl;
+ if ( pi->isKind<Package>() )
+ {
+ message << indent << pi->asKind<Package>()->changelog() << endl;
+ }
+}
+
/******************************************************************
**
** FUNCTION NAME : main
@@ -45,6 +59,30 @@
appname = Pathname::basename( argv[0] );
--argc,++argv;
+ Pathname sysRoot("/");
+ bool verbose = false;
+
+ while ( argc && (*argv)[0] == '-' )
+ {
+ if ( (*argv) == std::string("--root") )
+ {
+ --argc,++argv;
+ if ( ! argc )
+ return errexit("--root requires an argument.");
+
+ if ( ! PathInfo( *argv ).isDir() )
+ return errexit("--root requires a directory.");
+
+ sysRoot = *argv;
+ }
+ else if ( (*argv) == std::string("-v") )
+ {
+ verbose = true;
+ }
+
+ --argc,++argv;
+ }
+
if ( ! argc )
{
return usage();
@@ -53,22 +91,8 @@
///////////////////////////////////////////////////////////////////
ZConfig::instance();
- Pathname sysRoot("/");
sat::Pool satpool( sat::Pool::instance() );
- if ( (*argv) == std::string("--root") )
- {
- --argc,++argv;
- if ( ! argc )
- return errexit("--root requires an argument.");
-
- if ( ! PathInfo( *argv ).isDir() )
- return errexit("--root requires a directory.");
-
- sysRoot = *argv;
- --argc,++argv;
- }
-
if ( TestSetup::isTestcase( sysRoot ) )
{
message << str::form( "*** Load Testcase from '%s'", sysRoot.c_str() ) <<
endl;
@@ -130,7 +154,15 @@
for ( ; argc; --argc,++argv )
{
- message << dump( ui::Selectable::get( IdString( *argv ) ) ) << endl;
+ ui::Selectable::Ptr sel( ui::Selectable::get( IdString( *argv ) ) );
+ message << dump( sel ) << endl;
+ if ( verbose )
+ {
+ for_( it, sel->installedBegin(), sel->installedEnd() )
+ dumpPi( message, *it );
+ for_( it, sel->availableBegin(), sel->availableEnd() )
+ dumpPi( message, *it );
+ }
}
INT << "===[END]============================================" << endl <<
endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/CMakeLists.txt
new/libzypp-9.10.1/zypp/CMakeLists.txt
--- old/libzypp-9.9.2/zypp/CMakeLists.txt 2011-07-28 13:17:25.000000000
+0200
+++ new/libzypp-9.10.1/zypp/CMakeLists.txt 2011-08-05 15:31:31.000000000
+0200
@@ -487,8 +487,6 @@
solver/detail/ProblemSolutionIgnore.cc
solver/detail/ProblemSolutionCombi.cc
solver/detail/Resolver.cc
- solver/detail/ResolverUpgrade.cc
- solver/detail/Resolver_problems.cc
solver/detail/SolutionAction.cc
solver/detail/Testcase.cc
solver/detail/SolverQueueItem.cc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/Resolver.cc
new/libzypp-9.10.1/zypp/Resolver.cc
--- old/libzypp-9.9.2/zypp/Resolver.cc 2011-07-28 13:17:25.000000000 +0200
+++ new/libzypp-9.10.1/zypp/Resolver.cc 2011-08-05 15:31:31.000000000 +0200
@@ -87,6 +87,7 @@
void Resolver::resetOnlyRequires() {
_pimpl->setOnlyRequires( indeterminate ); }
bool Resolver::onlyRequires() const { return
_pimpl->onlyRequires(); }
+ void Resolver::setUpgradeMode( bool yesno_r ) { return
_pimpl->setUpgradeMode( yesno_r ); }
bool Resolver::upgradeMode() const { return
_pimpl->isUpgradeMode(); }
void Resolver::setAllowVendorChange( bool yesno_r ) {
_pimpl->setAllowVendorChange( yesno_r ); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/Resolver.h
new/libzypp-9.10.1/zypp/Resolver.h
--- old/libzypp-9.9.2/zypp/Resolver.h 2011-07-28 13:17:25.000000000 +0200
+++ new/libzypp-9.10.1/zypp/Resolver.h 2011-08-05 15:31:31.000000000 +0200
@@ -119,6 +119,9 @@
* all packages with a special resolver algorithm which takes
* care of package splits, pattern and product updates,
* etc.
+ * This call also turns the solver into \ref upgradeMode, so
+ * consecutive calls to \ref resolvePool performed in this
+ * mode too. Call \ref setUpgradeMode to turn this mode off.
*
* \see \ref addUpgradeRepo
**/
@@ -188,8 +191,11 @@
bool onlyRequires() const;
/**
- * Whether the \ref Resolver is in upgrade mode.
+ * Setting whether the solver should perform in 'upgrade' mode or
+ * not.
+ * \see \ref doUpgrade.
*/
+ void setUpgradeMode( bool yesno_r );
bool upgradeMode() const;
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/media/Mount.cc
new/libzypp-9.10.1/zypp/media/Mount.cc
--- old/libzypp-9.9.2/zypp/media/Mount.cc 2011-07-28 13:17:25.000000000
+0200
+++ new/libzypp-9.10.1/zypp/media/Mount.cc 2011-08-05 15:31:31.000000000
+0200
@@ -282,7 +282,7 @@
{
mtabs.push_back("/proc/mounts");
// Also read /etc/mtab if it is a file (on newer sytems
- // mtab is a symlink to /proc/mounts).
+ // mtab is a symlink to /proc/mounts).
// Reason for this is the different representation of
// mounted loop devices:
// /etc/mtab: /tmp/SLES-11-SP2-MINI-ISO-x86_64-Beta2-DVD.iso on /mnt
type iso9660 (ro,loop=/dev/loop0)
@@ -324,6 +324,17 @@
ent.mnt_freq, ent.mnt_passno
);
+ // Attempt quick fix for bnc#710269:
+ // MountEntry is "//dist/install/ on /var/adm/mount/AP_0x00000001
type cifs (ro,relatime,unc=\dist\install,username=,domain=suse.de"
+ // but looking for "Looking for
media(cifs<//dist/install>)attached(*/var/adm/mount/AP_0x00000001)"
+ // Kick the trailing '/' in "//dist/install/"
+ // TODO: Check and fix comparison in MediaHandler::checkAttached
instead.
+ if ( ( entry.type == "cifs" || entry.type == "smb" )
+ && entry.src.size() > 1 // not for "/"
+ && entry.src[entry.src.size()-1] == '/' )
+ {
+ entry.src.erase( entry.src.size()-1 );
+ }
entries.push_back(entry);
memset(buf, 0, sizeof(buf));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/solver/detail/Resolver.cc
new/libzypp-9.10.1/zypp/solver/detail/Resolver.cc
--- old/libzypp-9.9.2/zypp/solver/detail/Resolver.cc 2011-07-28
13:17:25.000000000 +0200
+++ new/libzypp-9.10.1/zypp/solver/detail/Resolver.cc 2011-08-05
15:31:31.000000000 +0200
@@ -36,6 +36,7 @@
#include "zypp/sat/Pool.h"
#include "zypp/sat/Solvable.h"
#include "zypp/sat/Transaction.h"
+#include "zypp/ResolverProblem.h"
#define MAXSOLVERRUNS 5
@@ -139,6 +140,13 @@
_installedSatisfied.clear();
}
+bool Resolver::doUpgrade()
+{
+ // Setting Resolver to upgrade mode. SAT solver will do the update
+ _upgradeMode = true;
+ return resolvePool();
+}
+
void Resolver::doUpdate()
{
_updateMode = true;
@@ -293,9 +301,9 @@
_satResolver->setSolveSrcPackages ( solveSrcPackages() );
_satResolver->setCleandepsOnRemove ( cleandepsOnRemove() );
+ _satResolver->setDistupgrade (_upgradeMode);
if (_upgradeMode) {
// may overwrite some settings
- _satResolver->setDistupgrade (true);
_satResolver->setDistupgrade_removeunsupported (false);
_satResolver->setUpdatesystem (true);
_satResolver->setAllowdowngrade (true);
@@ -362,6 +370,21 @@
//----------------------------------------------------------------------------
// Getting more information about the solve results
+ResolverProblemList Resolver::problems() const
+{
+ MIL << "Resolver::problems()" << endl;
+ return _satResolver->problems();
+}
+
+void Resolver::applySolutions( const ProblemSolutionList & solutions )
+{
+ for_( iter, solutions.begin(), solutions.end() )
+ {
+ ProblemSolution_Ptr solution = *iter;
+ if ( !solution->apply( *this ) )
+ break;
+ }
+}
void Resolver::collectResolverInfo()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/solver/detail/Resolver.h
new/libzypp-9.10.1/zypp/solver/detail/Resolver.h
--- old/libzypp-9.9.2/zypp/solver/detail/Resolver.h 2011-07-28
13:17:25.000000000 +0200
+++ new/libzypp-9.10.1/zypp/solver/detail/Resolver.h 2011-08-05
15:31:31.000000000 +0200
@@ -91,7 +91,13 @@
///////////////////////////////////////////////////////////////////
//
// CLASS NAME : Resolver
-
+/** A mid layer class we should remove
+ * \todo Merge this and class SATResolver. Logic and date are horribly
+ * distributed between this and SATResolver. Either SATResolver becomes
+ * a pure wrapper adapting the libsolv C interface to fit our needs, and
+ * all the solver logic and problem handling goes here; or completely merge
+ * both classes.
+ */
class Resolver : public base::ReferenceCounted, private base::NonCopyable {
private:
@@ -200,6 +206,7 @@
void setForceResolve( TriBool state_r ) { _forceResolve =
indeterminate(state_r) ? false : bool(state_r); }
bool isUpgradeMode() const { return _upgradeMode;
}// Resolver has been called with doUpgrade
+ void setUpgradeMode( bool yesno_r ) { _upgradeMode =
yesno_r; }
bool isUpdateMode() const { return _updateMode; } //
Resolver has been called with doUpdate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/solver/detail/ResolverUpgrade.cc
new/libzypp-9.10.1/zypp/solver/detail/ResolverUpgrade.cc
--- old/libzypp-9.9.2/zypp/solver/detail/ResolverUpgrade.cc 2011-07-28
13:17:25.000000000 +0200
+++ new/libzypp-9.10.1/zypp/solver/detail/ResolverUpgrade.cc 1970-01-01
01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*---------------------------------------------------------------------\
-| ____ _ __ __ ___ |
-| |__ / \ / / . \ . \ |
-| / / \ V /| _/ _/ |
-| / /__ | | | | | | |
-| /_____||_| |_| |_| |
-| |
-\---------------------------------------------------------------------*/
-/* ResolverUpgrade.cc
- *
- * Implements the distribution upgrade algorithm.
- *
- * Copyright (C) 2005 SUSE Linux Products GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "zypp/base/LogTools.h"
-#include "zypp/base/Exception.h"
-#include "zypp/ResPool.h"
-#include "zypp/ZYppFactory.h"
-#include "zypp/solver/detail/Resolver.h"
-#include "zypp/solver/detail/Testcase.h"
-#include "zypp/solver/detail/SATResolver.h"
-#include "zypp/Target.h"
-
-/////////////////////////////////////////////////////////////////////////
-namespace zypp
-{ ///////////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////////
- namespace solver
- { /////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////////
- namespace detail
- { ///////////////////////////////////////////////////////////////////
-
-using namespace std;
-using namespace zypp;
-
-//-----------------------------------------------------------------------------
-
-///////////////////////////////////////////////////////////////////
-//
-//
-// METHOD NAME : Resolver::doUpgrade
-// METHOD TYPE : bool
-//
-// DESCRIPTION : creates a testcase in /var/log/updateTestcase
-// and set the SAT solver in update mode
-//
-bool
-Resolver::doUpgrade()
-{
- Target_Ptr target( getZYpp()->getTarget() );
- if ( ! target )
- {
- WAR << "Huh, no target ?" << endl;
- }
-
- // Setting Resolver to upgrade mode. SAT solver will do the update
- _upgradeMode = true;
- return resolvePool();
-}
-
-
-///////////////////////////////////////////////////////////////////
- };// namespace detail
- /////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////////
- };// namespace solver
- ///////////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////////
-};// namespace zypp
-/////////////////////////////////////////////////////////////////////////
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libzypp-9.9.2/zypp/solver/detail/Resolver_problems.cc
new/libzypp-9.10.1/zypp/solver/detail/Resolver_problems.cc
--- old/libzypp-9.9.2/zypp/solver/detail/Resolver_problems.cc 2011-07-28
13:17:25.000000000 +0200
+++ new/libzypp-9.10.1/zypp/solver/detail/Resolver_problems.cc 1970-01-01
01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* Resolver_problems.cc
- *
- * Copyright (C) 2000-2002 Ximian, Inc.
- * Copyright (C) 2005 SUSE Linux Products GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include <map>
-#include <sstream>
-
-#include "zypp/solver/detail/Resolver.h"
-#include "zypp/solver/detail/SATResolver.h"
-#include "zypp/Resolver.h"
-#include "zypp/ResolverProblem.h"
-
-#include "zypp/base/String.h"
-#include "zypp/base/Logger.h"
-#include "zypp/base/Gettext.h"
-
-#include "zypp/base/Algorithm.h"
-#include "zypp/ResPool.h"
-#include "zypp/ResFilters.h"
-
-
-/////////////////////////////////////////////////////////////////////////
-namespace zypp
-{ ///////////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////////
- namespace solver
- { /////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////////
- namespace detail
- { ///////////////////////////////////////////////////////////////////
-
-using namespace std;
-
-ResolverProblemList
-Resolver::problems () const
-{
- MIL << "Resolver::problems()" << endl;
- return _satResolver->problems();
-}
-
-void
-Resolver::applySolutions (const ProblemSolutionList & solutions)
-{
- for (ProblemSolutionList::const_iterator iter = solutions.begin();
- iter != solutions.end(); ++iter) {
- ProblemSolution_Ptr solution = *iter;
- if (!solution->apply (*this))
- break;
- }
-}
-
-///////////////////////////////////////////////////////////////////
- };// namespace detail
- /////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////////
- };// namespace solver
- ///////////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////////
-};// namespace zypp
-/////////////////////////////////////////////////////////////////////////
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.9.2/zypp/target/rpm/BinHeader.cc
new/libzypp-9.10.1/zypp/target/rpm/BinHeader.cc
--- old/libzypp-9.9.2/zypp/target/rpm/BinHeader.cc 2011-07-28
13:17:25.000000000 +0200
+++ new/libzypp-9.10.1/zypp/target/rpm/BinHeader.cc 2011-08-05
15:31:31.000000000 +0200
@@ -95,6 +95,7 @@
unsigned BinHeader::intList::set( void * val_r, unsigned cnt_r, rpmTagType
type_r )
{
+ _type = type_r; // remember the type!
if ( val_r )
switch ( _type )
{
@@ -112,11 +113,11 @@
case RPM_INT32_TYPE:
std::vector<long>( (int32_t*)val_r, ((int32_t*)val_r)+cnt_r ).swap(
_data );
break;
- #ifdef _RPM_4_X
+#ifdef _RPM_4_X
case RPM_INT64_TYPE:
std::vector<long>( (int64_t*)val_r, ((int64_t*)val_r)+cnt_r ).swap(
_data );
break;
- #endif
+#endif
default:
std::vector<long>( cnt_r, 0L ).swap( _data );
break;
@@ -256,10 +257,13 @@
case RPM_INT8_TYPE:
case RPM_INT16_TYPE:
case RPM_INT32_TYPE:
+#ifdef _RPM_4_X
+ case RPM_INT64_TYPE:
+#endif
return lst_r.set( headerget.val(), headerget.cnt(), headerget.type() );
default:
- INT << "RPM_TAG MISSMATCH: RPM_INT32_TYPE " << tag_r << " got type "
<< headerget.type() << endl;
+ INT << "RPM_TAG MISSMATCH: RPM_INTxx_TYPE " << tag_r << " got type "
<< headerget.type() << endl;
}
}
}
@@ -327,9 +331,13 @@
return *((int16_t*)headerget.val());
case RPM_INT32_TYPE:
return *((int32_t*)headerget.val());
+#ifdef _RPM_4_X
+ case RPM_INT64_TYPE:
+ return *((int64_t*)headerget.val());
+#endif
default:
- INT << "RPM_TAG MISSMATCH: RPM_INT32_TYPE " << tag_r << " got type "
<< headerget.type() << endl;
+ INT << "RPM_TAG MISSMATCH: RPM_INTxx_TYPE " << tag_r << " got type "
<< headerget.type() << endl;
}
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
