SET(LIBZYPP_MAJOR "6")
SET(LIBZYPP_COMPATMINOR "10")
SET(LIBZYPP_MINOR "10")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
#
-# LAST RELEASED: 6.10.0 (10)
+# LAST RELEASED: 6.10.1 (10)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
bool rres = false;
{
zypp::base::LogControl::TmpLineWriter shutUp;
- UpgradeStatistics u;
- rres = getZYpp()->resolver()->doUpgrade( u );
+ rres = getZYpp()->resolver()->doUpgrade();
}
if ( ! rres )
{
bool rres = false;
{
zypp::base::LogControl::TmpLineWriter shutUp;
- UpgradeStatistics u;
- rres = getZYpp()->resolver()->doUpgrade( u );
+ rres = getZYpp()->resolver()->doUpgrade();
}
if ( ! rres )
{
if ( 0 )
{
Measure x( "Upgrade" );
- UpgradeStatistics u;
- getZYpp()->resolver()->doUpgrade( u );
+ getZYpp()->resolver()->doUpgrade();
}
///////////////////////////////////////////////////////////////////
#include "Tools.h"
-#include "zypp/base/Easy.h"
-#include "zypp/base/LogTools.h"
-#include "zypp/base/InputStream.h"
-#include "zypp/base/ReferenceCounted.h"
-#include "zypp/base/NonCopyable.h"
-#include "zypp/base/PtrTypes.h"
-
-#include "zypp/TmpPath.h"
-
-#include "zypp/RepoManager.h"
-#include "zypp/RepoInfo.h"
-#include "zypp/repo/PackageProvider.h"
-
-#include "zypp/ResPoolProxy.h"
-
-using std::endl;
-using namespace zypp;
+#include <zypp/PoolQuery.h>
///////////////////////////////////////////////////////////////////
-static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" );
+//static const Pathname sysRoot( getenv("SYSROOT") ? getenv("SYSROOT") : "/Local/ROOT" );
+static const Pathname sysRoot( "/tmp/Local/ma/DNL-test" );
///////////////////////////////////////////////////////////////////
bool rres = false;
{
//zypp::base::LogControl::TmpLineWriter shutUp;
- rres = getZYpp()->resolver()->resolvePool();
+ //rres = test.resolver().resolvePool();
}
if ( ! rres )
{
return true;
}
-ManagedFile providePkg( const PoolItem & pi )
-{
- Package::constPtr p = asKind<Package>( pi.resolvable() );
- if ( ! pi )
- return ManagedFile();
-
- repo::RepoMediaAccess access;
- std::list<Repository> repos;
- repo::DeltaCandidates deltas( repos );
- repo::PackageProvider pkgProvider( access, p, deltas );
-
- return pkgProvider.providePackage();
-}
-
-/******************************************************************
-**
-** FUNCTION NAME : main
-** FUNCTION TYPE : int
-*/
int main( int argc, char * argv[] )
-{
+try {
+ --argc;
+ ++argv;
+ zypp::base::LogControl::instance().logToStdErr();
INT << "===[START]==========================================" << endl;
-
- RepoManager repoManager( makeRepoManager( sysRoot ) );
- ResPool pool( ResPool::instance() );
- sat::Pool satpool( sat::Pool::instance() );
-
-// mksrc( "file:///schnell/CD-ARCHIVE/SLES10/SLE-10-SP1/SLES-10-SP1-GM/ia64/DVD1", "SLE" );
-// mksrc( "file:///mounts/dist/install/SLP/SLES-10-SP2-AS-LATEST/i386/CD1", "factorytest" );
-// mksrc( "iso:///?iso=openSUSE-10.3-GM-DVD9-BiArch-DVD1.iso&url=file:///schnell/CD-ARCHIVE/10.3/iso", "10.3.iso", repoManager );
- mksrc( "file:///Local/SRC/test/", "test", repoManager );
-
+ ZConfig::instance();
+ TestSetup::LoadSystemAt( sysRoot );
+ ///////////////////////////////////////////////////////////////////
+ ResPool pool( ResPool::instance() );
+ sat::Pool satpool( sat::Pool::instance() );
+ ///////////////////////////////////////////////////////////////////
+ dumpRange( USR, satpool.reposBegin(), satpool.reposEnd() ) << endl;
USR << "pool: " << pool << endl;
- PoolItem pi ( getPi<Package>("BitTorrent-curses", Edition("4.0.3-115"), Arch_i586 ) );
- MIL << pi << endl;
- if ( pi )
- {
- providePkg( pi );
- }
+ ///////////////////////////////////////////////////////////////////
- //getSel<Pattern>( "basesystem" )->setStatus( ui::S_Install );
- //getSel<Pattern>( "slesas-ofed-base" )->setStatus( ui::S_Install );
- if ( 0 )
- {
- vdumpPoolStats( USR << "Transacting:"<< endl,
- make_filter_begin<resfilter::ByTransact>(pool),
- make_filter_end<resfilter::ByTransact>(pool) ) << endl;
- solve();
- vdumpPoolStats( USR << "Transacting:"<< endl,
- make_filter_begin<resfilter::ByTransact>(pool),
- make_filter_end<resfilter::ByTransact>(pool) ) << endl;
- }
+ getZYpp()->resolver()->addRequire( Capability("xteddy") );
+ solve();
+ vdumpPoolStats( USR << "Transacting:"<< endl,
+ make_filter_begin<resfilter::ByTransact>(pool),
+ make_filter_end<resfilter::ByTransact>(pool) ) << endl;
+
+ ///////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
+ zypp::base::LogControl::instance().logNothing();
return 0;
}
+catch ( const Exception & exp )
+{
+ INT << exp << endl << exp.historyAsString();
+}
+catch (...)
+{}
+
if ( 0 )
{
Measure x( "Upgrade" );
- UpgradeStatistics u;
- getZYpp()->resolver()->doUpgrade( u );
+ getZYpp()->resolver()->doUpgrade();
}
///////////////////////////////////////////////////////////////////
\li \c MediaManager::attachDesiredMedia renamed to MediaManager::attach
<HR>
+\section V_6_10_0 6.10.0 - Removed zypp::UpgradeStatistics
+Since \c Code-11 the distribution upgrade is computed by the satsolver and no longer by
+libzypp itself. For some reason zypp::UpgradeStatistics were still present in the interfaces,
+but actually no longer used. Neither as input nor as result struct. Now they are removed.
+<HR>
+
*/
}
-------------------------------------------------------------------
+Wed Jul 8 16:19:31 CEST 2009 - ma@suse.de
+
+- Remove obsolete UpgradeStatistics class from libzypp.
+- version 6.10.1 (10)
+
+-------------------------------------------------------------------
Tue Jul 7 17:45:47 CEST 2009 - ma@suse.de
- Fix HistoryLog to initialize on demand.
SysContent.cc
Target.cc
TmpPath.cc
- UpgradeStatistics.cc
Url.cc
VendorAttr.cc
VendorSupportOptions.cc
Target.h
TmpPath.h
TriBool.h
- UpgradeStatistics.h
Url.h
VendorAttr.h
VendorSupportOptions.h
#include "zypp/base/PtrTypes.h"
#include "zypp/ResPool.h"
-#include "zypp/UpgradeStatistics.h"
#include "zypp/solver/detail/Resolver.h"
#include "zypp/solver/detail/SolverQueueItem.h"
#include "zypp/ProblemTypes.h"
* etc.
**/
bool doUpgrade();
- /** \deprecated The UpgradeStatistics argument is a meanwhile useless relict of pre-satsolver days. */
- ZYPP_DEPRECATED bool doUpgrade( UpgradeStatistics & )
- { return doUpgrade(); }
/**
* Update to newest package
+++ /dev/null
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*---------------------------------------------------------------------\
-| ____ _ __ __ ___ |
-| |__ / \ / / . \ . \ |
-| / / \ V /| _/ _/ |
-| / /__ | | | | | | |
-| /_____||_| |_| |_| |
-| |
-\---------------------------------------------------------------------*/
-/* UpgradeStatistics.cc
- *
- * 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.
- */
-
-/*
- stolen from PMPackageManager_update.cc
- original author Michael Andres <ma@suse.de>
- zypp port by Klaus Kaempf <kkaempf@suse.de>
-
-/-*/
-
-#include <iostream>
-#include "zypp/base/Logger.h"
-#include "zypp/UpgradeStatistics.h"
-
-/////////////////////////////////////////////////////////////////////////
-namespace zypp
-{ ///////////////////////////////////////////////////////////////////////
-
-using namespace std;
-
-UpgradeStatistics::~UpgradeStatistics()
-{}
-
-/******************************************************************
-**
-**
-** FUNCTION NAME : operator<<
-** FUNCTION TYPE : std::ostream &
-**
-** DESCRIPTION :
-*/
-std::ostream &
-UpgradeStatistics::dumpOn( std::ostream & str ) const
-{
- str << "===[initial]========================================" << endl;
- str << "pre_todel " << pre_todel << endl;
- str << "pre_nocand " << pre_nocand << endl;
- str << "pre_avcand " << pre_avcand << endl;
- str << "===[checks]=========================================" << endl;
- str << "chk_installed_total " << chk_installed_total << endl;
- str << endl;
- str << "chk_already_todel " << chk_already_todel << endl;
- str << "chk_is_taboo " << chk_is_taboo << endl;
- str << endl;
- str << "chk_already_toins " << chk_already_toins << endl;
- str << "chk_to_update " << chk_to_update << endl;
- str << "chk_to_downgrade " << chk_to_downgrade << endl;
- str << "chk_to_keep_downgrade" << chk_to_keep_downgrade << endl;
- str << "chk_to_keep_installed" << chk_to_keep_installed << endl;
- str << "--------------------------" << endl;
- str << "avcand "
- << ( chk_already_toins + chk_to_update + chk_to_downgrade + chk_to_keep_downgrade + chk_to_keep_installed )
- << endl;
- str << endl;
- str << "chk_keep_foreign " << chk_keep_foreign << endl;
- str << "chk_dropped " << chk_dropped << endl;
- str << "chk_replaced " << chk_replaced << endl;
- str << "chk_replaced_guessed " << chk_replaced_guessed << endl;
- str << "chk_add_split " << chk_add_split << endl;
- str << "--------------------------" << endl;
- str << "nocand "
- << ( chk_keep_foreign + chk_dropped + chk_replaced + chk_replaced_guessed + chk_add_split )
- << endl;
- str << "===[sum]============================================" << endl;
- str << "Packages checked " << chk_installed_total << endl;
- str << endl;
- str << "totalToInstall " << totalToInstall() << endl;
- str << "totalToDelete " << totalToDelete() << endl;
- str << "totalToKeep " << totalToKeep() << endl;
- str << "--------------------------" << endl;
- str << "sum "
- << ( totalToInstall() + totalToDelete() + totalToKeep() )
- << endl;
- str << "====================================================" << endl;
- str << "====================================================" << endl;
-
- return str;
-}
-
-
- ///////////////////////////////////////////////////////////////////////
-};// namespace zypp
-/////////////////////////////////////////////////////////////////////////
-
-
+++ /dev/null
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* ResolverUpgrade.h
- *
- * 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.
- */
-
-/*
- stolen from PMPackageManager_update.cc
- original author Michael Andres <ma@suse.de>
- zypp port by Klaus Kaempf <kkaempf@suse.de>
-
-/-*/
-
-#ifndef ZYPP_UPGRADESTATISTICS_H
-#define ZYPP_UPGRADESTATISTICS_H
-#warning This include and the classes declared inside are depreceated.
-
-#include <iosfwd>
-#include <list>
-#include <string>
-
-#include "zypp/base/Deprecated.h"
-
-/////////////////////////////////////////////////////////////////////////
-namespace zypp
-{ ///////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-//
-// CLASS NAME : UpgradeOptions
-/**
- * @short Struct for update options
- **/
-class ZYPP_DEPRECATED UpgradeOptions {
-
- public:
-
- ///////////////////////////////////////////////////////////////////
- // OPTIONS
- ///////////////////////////////////////////////////////////////////
-
- /**
- * If true, version downgrades are silently performed. Assuming the
- * installation media contains a consistent sytem, and we target
- * this well defined state.
- **/
- bool silent_downgrades;
-
- public:
-
- UpgradeOptions()
- : silent_downgrades ( false )
- {}
-
- ~UpgradeOptions() {}
-};
-
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-//
-// CLASS NAME : UpgradeStatistics
-/**
- * @short Struct for update options, statistics, and result lists.
- *
- * \deprecated
- **/
-class ZYPP_DEPRECATED UpgradeStatistics : public UpgradeOptions {
-
- virtual std::ostream & dumpOn( std::ostream & str ) const;
- friend std::ostream & operator<<( std::ostream & str, const UpgradeStatistics & obj )
- { return obj.dumpOn (str); }
-
- public:
-
- ///////////////////////////////////////////////////////////////////
- // STATISTICS
- ///////////////////////////////////////////////////////////////////
-
- /**
- * initial status: packages already tagged to delete
- **/
- unsigned pre_todel;
- /**
- * initial status: packages without candidate (foreign, replaced or dropped)
- **/
- unsigned pre_nocand;
- /**
- * initial status: packages with candidate (available for update)
- **/
- unsigned pre_avcand;
-
-
- /**
- * update checks: total number of packages checked (should be number of installed packages)
- **/
- unsigned chk_installed_total;
-
- /**
- * update checks: packages already tagged to delete (should be pre_todel)
- **/
- unsigned chk_already_todel;
-
- /**
- * update checks: packages skipped due to taboo (foreign)
- **/
- unsigned chk_is_taboo;
-
- /**
- * update checks: with candidate: packages already tagged to install
- **/
- unsigned chk_already_toins;
-
- /**
- * update checks: with candidate: packages updated to new version
- **/
- unsigned chk_to_update;
-
- /**
- * update checks: with candidate: packages downgraded
- *
- * Installed and candidate package have vendor SuSE and candidates buildtime
- * is newer.
- **/
- unsigned chk_to_downgrade;
-
- /**
- * update checks: with candidate: packages untouched (foreign package downgrade)
- **/
- unsigned chk_to_keep_downgrade;
-
- /**
- * update checks: with candidate: packages untouched (uptodate)
- **/
- unsigned chk_to_keep_installed;
-
- /**
- * update checks: without candidate: installed package has not vendor SuSE
- *
- * Remains untouched.
- **/
- unsigned chk_keep_foreign;
-
- /**
- * update checks: without candidate: packages dropped (or SuSE internal)
- *
- * There's no available candidate providing it.
- **/
- unsigned chk_dropped;
-
- /**
- * update checks: without candidate: packages replaced
- *
- * There's exactly one available candidate providing it.
- **/
- unsigned chk_replaced;
-
- /**
- * update checks: without candidate: packages added by splitprovides
- *
- * Only packages not selected by one of the above checks are counted.
- **/
- unsigned chk_add_split;
-
- /**
- * update checks: without candidate: package replaced (but not uniqe, thus guessed)
- *
- * There are multiple available candidates providing it. If at the end
- * at least one out of these candidates was set to install by one of the
- * above checks, it's ok. Otherwise we have to guess one.
- **/
- unsigned chk_replaced_guessed;
-
- public:
-
- UpgradeStatistics() {
- // initial status
- pre_todel = 0;
- pre_nocand = 0;
- pre_avcand = 0;
- // update checks
- chk_installed_total = 0;
- chk_already_todel = 0;
- chk_is_taboo = 0;
- // packages with candidate
- chk_already_toins = 0;
- chk_to_update = 0;
- chk_to_downgrade = 0;
- chk_to_keep_downgrade = 0;
- chk_to_keep_installed = 0;
- // packages without candidate
- chk_keep_foreign = 0;
- chk_dropped = 0;
- chk_replaced = 0;
- chk_replaced_guessed = 0;
- chk_add_split = 0;
- }
- virtual ~UpgradeStatistics();
-
- /**
- * total number of packages that will be installed
- **/
- unsigned totalToInstall() const
- {
- return chk_already_toins
- + chk_to_update + chk_to_downgrade
- + chk_replaced + chk_replaced_guessed + chk_add_split;
- }
-
- /**
- * total number of packages that will be finally deleted
- * (does not count the replaced packages)
- **/
- unsigned totalToDelete() const
- {
- return chk_already_todel + chk_dropped;
- }
-
- /**
- * total number of packages that remain untouched
- **/
- unsigned totalToKeep() const
- {
- return chk_is_taboo + chk_to_keep_downgrade + chk_to_keep_installed + chk_keep_foreign + chk_dropped;
- }
-};
-
-///////////////////////////////////////////////////////////////////
- ///////////////////////////////////////////////////////////////////////
-};// namespace zypp
-/////////////////////////////////////////////////////////////////////////
-
-
-#endif // ZYPP_UPGRADESTATISTICS_H
projects / platform / upstream / libzypp.git / commitdiff