Author: mlandres Date: Wed Jul 16 01:12:56 2008 New Revision: 10592 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10592&view=rev Log: Remove Atom, Script, Message and other obsolete classes Removed: trunk/libzypp/tools/cachetools/ trunk/libzypp/zypp/Atom.cc trunk/libzypp/zypp/Atom.h trunk/libzypp/zypp/Message.cc trunk/libzypp/zypp/Message.h trunk/libzypp/zypp/Script.cc trunk/libzypp/zypp/Script.h trunk/libzypp/zypp/repo/ScriptProvider.cc trunk/libzypp/zypp/repo/ScriptProvider.h trunk/libzypp/zypp/ui/PatchContents.cc trunk/libzypp/zypp/ui/PatchContents.h trunk/libzypp/zypp/ui/PatchContentsImpl.cc trunk/libzypp/zypp/ui/PatchContentsImpl.h trunk/libzypp/zypp/ui/PatternContents.cc trunk/libzypp/zypp/ui/PatternContents.h trunk/libzypp/zypp/ui/PatternContentsImpl.cc trunk/libzypp/zypp/ui/PatternContentsImpl.h trunk/libzypp/zypp/ui/PatternExpander.cc trunk/libzypp/zypp/ui/PatternExpander.h Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/tools/CMakeLists.txt trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/Patch.cc trunk/libzypp/zypp/Patch.h trunk/libzypp/zypp/ResKind.cc trunk/libzypp/zypp/ResKind.h trunk/libzypp/zypp/ResObject.cc trunk/libzypp/zypp/ResObjects.h trunk/libzypp/zypp/ResTraits.h trunk/libzypp/zypp/ZYppCallbacks.h trunk/libzypp/zypp/sat/Solvable.cc trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc trunk/libzypp/zypp/target/TargetImpl.cc trunk/libzypp/zypp/ui/UserWantedPackages.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Wed Jul 16 01:12:56 2008 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "5") -SET(LIBZYPP_MINOR "0") -SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_MINOR "1") +SET(LIBZYPP_COMPATMINOR "1") +SET(LIBZYPP_PATCH "0") Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Wed Jul 16 01:12:56 2008 @@ -35,7 +35,6 @@ #include "zypp/repo/DeltaCandidates.h" #include "zypp/repo/PackageProvider.h" -#include "zypp/repo/ScriptProvider.h" #include "zypp/repo/SrcPackageProvider.h" #include "zypp/ui/PatchContents.h" @@ -496,22 +495,6 @@ PoolItem pi = getPi<Patch>( "fetchmsttfonts.sh" ); USR << pi << endl; - pi = getPi<Script>( "fetchmsttfonts.sh-4347-patch-fetchmsttfonts.sh-2" ); - USR << pi << endl; - - if ( pi ) - { - Script::constPtr script_r( asKind<Script>( pi.resolvable() ) ); - MIL << script_r << endl; - if ( script_r ) - { - repo::RepoMediaAccess access_r; - repo::ScriptProvider prov( access_r ); - ManagedFile localfile = prov.provideScript( script_r, true ); - MIL << localfile << endl; - } - } - //pi.status().setTransact( true, ResStatus::USER ); //install(); Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Wed Jul 16 01:12:56 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 16 01:10:37 CEST 2008 - ma@suse.de + +- Remove Atom, Script, Message and other obsolete classes. +- version 5.2.0 +- revision 10592 + +------------------------------------------------------------------- Mon Jul 14 13:36:26 CEST 2008 - ma@suse.de - Also report the name of the locking process in ZYppFactoryException Modified: trunk/libzypp/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/CMakeLists.txt?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/tools/CMakeLists.txt (original) +++ trunk/libzypp/tools/CMakeLists.txt Wed Jul 16 01:12:56 2008 @@ -1,4 +1,3 @@ ADD_SUBDIRECTORY( registration ) ADD_SUBDIRECTORY( package-manager ) -#ADD_SUBDIRECTORY( cachetools ) #ADD_SUBDIRECTORY( migrate-sources ) Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Wed Jul 16 01:12:56 2008 @@ -8,7 +8,6 @@ #FILE(WRITE filename "message to write"... ) SET( zypp_SRCS - Atom.cc ByteCount.cc Capabilities.cc Capability.cc @@ -31,7 +30,6 @@ Locks.cc MediaProducts.cc MediaSetAccess.cc - Message.cc NameKindProxy.cc NVRA.cc NVRAD.cc @@ -64,7 +62,6 @@ ResPool.cc ResPoolProxy.cc ResStatus.cc - Script.cc Service.cc Signature.cc SrcPackage.cc @@ -90,7 +87,6 @@ SET( zypp_HEADERS Arch.h - Atom.h AutoDispose.h Bit.h ByteCount.h @@ -121,7 +117,6 @@ ManagedFile.h MediaProducts.h MediaSetAccess.h - Message.h NameKindProxy.h Vendor.h NVRAD.h @@ -163,7 +158,6 @@ ResPoolProxy.h ResStatus.h ResTraits.h - Script.h Service.h Signature.h SrcPackage.h @@ -370,23 +364,11 @@ SET( zypp_parser_susetags_SRCS parser/susetags/RepoIndex.cc parser/susetags/ContentFileReader.cc - #parser/susetags/PackagesFileReader.cc - #parser/susetags/PackagesLangFileReader.cc - #parser/susetags/PackagesDuFileReader.cc - #parser/susetags/PatternFileReader.cc - #parser/susetags/RepoParser.cc ) SET( zypp_parser_susetags_HEADERS parser/susetags/RepoIndex.h parser/susetags/ContentFileReader.h - parser/susetags/FileReaderBase.h - parser/susetags/FileReaderBaseImpl.h - parser/susetags/PackagesFileReader.h - parser/susetags/PackagesLangFileReader.h - parser/susetags/PackagesDuFileReader.h - parser/susetags/PatternFileReader.h - parser/susetags/RepoParser.h ) INSTALL( FILES @@ -434,32 +416,13 @@ ) SET( zypp_parser_yum_SRCS - #parser/yum/RepoParser.cc - #parser/yum/FileReaderBaseImpl.cc parser/yum/RepomdFileReader.cc parser/yum/PatchesFileReader.cc - #parser/yum/PrimaryFileReader.cc - #parser/yum/OtherFileReader.cc - #parser/yum/FilelistsFileReader.cc - #parser/yum/PatchFileReader.cc - #parser/yum/PatternFileReader.cc - #parser/yum/ProductFileReader.cc ) SET( zypp_parser_yum_HEADERS - parser/yum/RepoParser.h - parser/yum/RepoParserOpts.h - parser/yum/FileReaderBase.h - parser/yum/FileReaderBaseImpl.h parser/yum/RepomdFileReader.h parser/yum/PatchesFileReader.h - parser/yum/PrimaryFileReader.h - parser/yum/OtherFileReader.h - parser/yum/FilelistsFileReader.h - parser/yum/PatchFileReader.h - parser/yum/PatternFileReader.h - parser/yum/ProductFileReader.h - parser/yum/schemanames.h ) INSTALL( FILES @@ -469,7 +432,6 @@ SET( zypp_parser_ws_SRCS parser/ws/WebpinResultFileReader.cc - ) SET( zypp_parser_ws_HEADERS @@ -688,11 +650,6 @@ ) SET( zypp_ui_SRCS - ui/PatchContents.cc - ui/PatchContentsImpl.cc - ui/PatternContents.cc - ui/PatternContentsImpl.cc - ui/PatternExpander.cc ui/Selectable.cc ui/SelectableImpl.cc ui/Status.cc @@ -700,11 +657,6 @@ ) SET( zypp_ui_HEADERS - ui/PatchContents.h - ui/PatchContentsImpl.h - ui/PatternContents.h - ui/PatternContentsImpl.h - ui/PatternExpander.h ui/SelFilters.h ui/Selectable.h ui/SelectableImpl.h @@ -754,7 +706,6 @@ repo/RepoType.cc repo/PackageProvider.cc repo/SrcPackageProvider.cc - repo/ScriptProvider.cc repo/RepoProvideFile.cc repo/DeltaCandidates.cc repo/Applydeltarpm.cc @@ -770,7 +721,6 @@ repo/RepoType.h repo/PackageProvider.h repo/SrcPackageProvider.h - repo/ScriptProvider.h repo/RepoProvideFile.h repo/DeltaCandidates.h repo/Applydeltarpm.h Modified: trunk/libzypp/zypp/Patch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Patch.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/Patch.cc (original) +++ trunk/libzypp/zypp/Patch.cc Wed Jul 16 01:12:56 2008 @@ -12,7 +12,6 @@ #include "zypp/base/Logger.h" #include "zypp/Patch.h" -#include "zypp/Message.h" using std::endl; @@ -84,6 +83,7 @@ bool Patch::interactive() const { if ( rebootSuggested() + || ! message().empty() || ! licenseToConfirm().empty() ) { return true; @@ -92,8 +92,7 @@ Patch::Contents c( contents() ); for_( it, c.begin(), c.end() ) { - if ( it->isKind( ResKind::message ) - || ! licenseToConfirm().empty() ) + if ( ! licenseToConfirm().empty() ) { return true; } Modified: trunk/libzypp/zypp/Patch.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Patch.h?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/Patch.h (original) +++ trunk/libzypp/zypp/Patch.h Wed Jul 16 01:12:56 2008 @@ -124,7 +124,6 @@ */ ReferenceIterator referencesEnd() const; - public: /** Patch ID * \deprecated Seems to be unsused autobuild interal data? @@ -132,13 +131,6 @@ ZYPP_DEPRECATED std::string id() const { return std::string(); } - /** The list of all atoms building the patch - * \deprecated Try contents(). - */ - typedef std::listResObject::Ptr AtomList; - ZYPP_DEPRECATED AtomList atoms() const - { return AtomList(); } - protected: friend Ptr make<Self>( const sat::Solvable & solvable_r ); /** Ctor */ Modified: trunk/libzypp/zypp/ResKind.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResKind.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/ResKind.cc (original) +++ trunk/libzypp/zypp/ResKind.cc Wed Jul 16 01:12:56 2008 @@ -23,20 +23,13 @@ { ///////////////////////////////////////////////////////////////// const ResKind ResKind::nokind; - const ResKind ResKind::atom ( "atom" ); - const ResKind ResKind::message ( "message" ); const ResKind ResKind::package ( "package" ); const ResKind ResKind::patch ( "patch" ); const ResKind ResKind::pattern ( "pattern" ); const ResKind ResKind::product ( "product" ); - const ResKind ResKind::script ( "script" ); const ResKind ResKind::srcpackage( "srcpackage" ); template<> - const ResKind ResTraits<Atom> ::kind( ResKind::atom ); - template<> - const ResKind ResTraits<Message> ::kind( ResKind::message ); - template<> const ResKind ResTraits<Package> ::kind( ResKind::package ); template<> const ResKind ResTraits<Patch> ::kind( ResKind::patch ); @@ -45,8 +38,6 @@ template<> const ResKind ResTraits<Product> ::kind( ResKind::product ); template<> - const ResKind ResTraits<Script> ::kind( ResKind::script ); - template<> const ResKind ResTraits<SrcPackage>::kind( ResKind::srcpackage ); std::string ResKind::satIdent( const ResKind & refers_r, const std::string & name_r ) Modified: trunk/libzypp/zypp/ResKind.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResKind.h?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/ResKind.h (original) +++ trunk/libzypp/zypp/ResKind.h Wed Jul 16 01:12:56 2008 @@ -40,13 +40,10 @@ /** Value representing \c nokind (<tt>""</tt>)*/ static const ResKind nokind; - static const ResKind atom ZYPP_DEPRECATED; - static const ResKind message ZYPP_DEPRECATED; static const ResKind package; static const ResKind patch; static const ResKind pattern; static const ResKind product; - static const ResKind script ZYPP_DEPRECATED; static const ResKind srcpackage; //@} Modified: trunk/libzypp/zypp/ResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/ResObject.cc (original) +++ trunk/libzypp/zypp/ResObject.cc Wed Jul 16 01:12:56 2008 @@ -114,13 +114,10 @@ { ResKind kind( solvable_r.kind() ); #define OUTS(X) if ( kind == ResTraits<X>::kind ) return make<X>( solvable_r ); - OUTS( Atom ); - OUTS( Message ); OUTS( Package ); OUTS( Patch ); OUTS( Pattern ); OUTS( Product ); - OUTS( Script ); OUTS( SrcPackage ); #undef OUTS return 0; Modified: trunk/libzypp/zypp/ResObjects.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObjects.h?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/ResObjects.h (original) +++ trunk/libzypp/zypp/ResObjects.h Wed Jul 16 01:12:56 2008 @@ -12,13 +12,10 @@ #ifndef ZYPP_RESOBJECTS_H #define ZYPP_RESOBJECTS_H -#include "zypp/Atom.h" -#include "zypp/Message.h" #include "zypp/Package.h" #include "zypp/Patch.h" #include "zypp/Pattern.h" #include "zypp/Product.h" -#include "zypp/Script.h" #include "zypp/SrcPackage.h" #endif // ZYPP_RESOBJECTS_H Modified: trunk/libzypp/zypp/ResTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResTraits.h?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/ResTraits.h (original) +++ trunk/libzypp/zypp/ResTraits.h Wed Jul 16 01:12:56 2008 @@ -50,14 +50,11 @@ DEFINE_PTR_TYPE( Resolvable ); DEFINE_PTR_TYPE( ResObject ); - DEFINE_PTR_TYPE( Atom ); DEFINE_PTR_TYPE( Package ); DEFINE_PTR_TYPE( SrcPackage ); DEFINE_PTR_TYPE( Pattern ); DEFINE_PTR_TYPE( Product ); DEFINE_PTR_TYPE( Patch ); - DEFINE_PTR_TYPE( Script ); - DEFINE_PTR_TYPE( Message ); //@} /** ResTraits. Defines common types and the ResKind value. */ Modified: trunk/libzypp/zypp/ZYppCallbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppCallbacks.h?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/ZYppCallbacks.h (original) +++ trunk/libzypp/zypp/ZYppCallbacks.h Wed Jul 16 01:12:56 2008 @@ -16,7 +16,6 @@ #include "zypp/Resolvable.h" #include "zypp/RepoInfo.h" #include "zypp/Pathname.h" -#include "zypp/Message.h" #include "zypp/Package.h" #include "zypp/Patch.h" #include "zypp/Url.h" @@ -442,41 +441,6 @@ {} }; - // resolvable Message - // DEPRECATED: replaced by PatchMessageReport - struct ZYPP_DEPRECATED MessageResolvableReport : public callback::ReportBase - { - virtual void show( - Message::constPtr /*message*/ - ) {} - }; - - // resolvable Script - // DEPRECATED: replaced by PatchScriptReport - struct ZYPP_DEPRECATED ScriptResolvableReport : public callback::ReportBase - { - enum Task { DO, UNDO }; - enum Notify { OUTPUT, PING }; - - /** Whether executing do_script on install or undo_script on delete. */ - virtual void start( const Resolvable::constPtr & /*script_r*/, - const Pathname & /*path_r*/, - Task ) - {} - /** Progress provides the script output. If the script is quiet, - * from time to time still-alive pings are sent to the ui. Returning \c FALSE - * aborts script execution. - */ - virtual bool progress( Notify , const std::string & = std::string() ) - { return true; } - /** Report error. */ - virtual void problem( const std::string & /*description*/ ) - {} - /** Report success. */ - virtual void finish() - {} - }; - /////////////////////////////////////////////////////////////////// namespace rpm { Modified: trunk/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.cc (original) +++ trunk/libzypp/zypp/sat/Solvable.cc Wed Jul 16 01:12:56 2008 @@ -60,11 +60,8 @@ // ----v case 'c': OUTS( patch, 5 ); return; break; case 'd': OUTS( product, 7 ); return; break; - case 'i': OUTS( script, 6 ); return; break; case 'k': OUTS( package, 7 ); return; break; - case 'm': OUTS( atom, 4 ); return; break; case 'p': OUTS( srcpackage, 10 ); return; break; - case 's': OUTS( message, 7 ); return; break; case 't': OUTS( pattern, 7 ); return; break; #undef OUTS } @@ -255,11 +252,8 @@ // ----v case 'c': OUTS( patch, 5 ); break; case 'd': OUTS( product, 7 ); break; - case 'i': OUTS( script, 6 ); break; case 'k': OUTS( package, 7 ); break; - case 'm': OUTS( atom, 4 ); break; case 'p': OUTS( srcpackage, 10 ); break; - case 's': OUTS( message, 7 ); break; case 't': OUTS( pattern, 7 ); break; #undef OUTS } Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Wed Jul 16 01:12:56 2008 @@ -239,7 +239,7 @@ if ( !path.isExist() ) { Testcase testcase("/var/log/updateTestcase"); - testcase.createTestcase (*this, true, false); // create pool, do not solve + testcase.createTestcase (*this, true, false); // create pool, do not solve } else { Testcase testcase("/mnt/var/log/updateTestcase"); testcase.createTestcase (*this, true, false); // create pool, do not solve @@ -372,14 +372,11 @@ } if ( isKind<Patch>(installed.resolvable()) - || isKind<Atom>(installed.resolvable()) - || isKind<Script>(installed.resolvable()) - || isKind<Message>(installed.resolvable()) || isKind<Pattern>(installed.resolvable())) { MIL << "Delete old: " << installed << endl; installed.status().setToBeUninstalled( ResStatus::APPL_HIGH ); - continue; + continue; } CandidateMap::iterator cand_it = candidatemap.find( installed ); @@ -428,7 +425,7 @@ // Remember new package for 2nd pass. Capability installedCap( installed->name(), installed->kind()); - + // find ALL providers sat::WhatProvides possibleProviders(installedCap); @@ -448,13 +445,13 @@ MIL << " IGNORE relation match (package is tagged to delete): " << provider << endl; } else if ( provider.status().isInstalled() ) { if (installed->name() == provider->name()) { - MIL << " IGNORE relation match (package is installed): " << provider << endl; + MIL << " IGNORE relation match (package is installed): " << provider << endl; } else { MIL << " Take installed package ONLY: " << provider << endl; providersMap.clear(); break; // exit for } - } + } else { FindMap::iterator it = providersMap.find( provider->name() ); @@ -582,7 +579,7 @@ if ( ! doesObsoleteItem (item, it->first ) ) { it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH ); } - obsoletedItems.insert (it->first); + obsoletedItems.insert (it->first); guess = PoolItem(); break; } else { @@ -613,7 +610,7 @@ if ( ! doesObsoleteItem (item, it->first ) ) { it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH ); } - obsoletedItems.insert (it->first); + obsoletedItems.insert (it->first); guess = PoolItem(); break; } else { @@ -634,7 +631,7 @@ if ( ! doesObsoleteItem (guess, it->first ) ) { it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH ); } - obsoletedItems.insert (it->first); + obsoletedItems.insert (it->first); ++opt_stats_r.chk_replaced_guessed; } } @@ -650,7 +647,7 @@ // Unmaintained packages which does not fit to the updated system // (broken dependencies) will be deleted. // Make a solverrun and return it to the calling function - + bool ret=checkUnmaintainedItems (); // Packages which obsoletes and do NOT required other installed packages will be installed if @@ -669,7 +666,7 @@ && provider.status().isInstalled() && !provider.status().isToBeUninstalled() && obsoletedItems.find(provider) == obsoletedItems.end()) { - + // checking if there is another item with the same obsoletes. If there is one // it would be randomly which package will be taken for update. So it is // safier not to update at all. @@ -688,10 +685,10 @@ it->status().setToBeInstalled( ResStatus::APPL_HIGH ); } else { MIL << item << " obsoletes " << provider << " but does not provide it." << endl; - MIL << " There is another item which obsoletes it too. I do not know whichone has to be taken" << endl; + MIL << " There is another item which obsoletes it too. I do not know whichone has to be taken" << endl; } - obsoletedItems.insert (provider); - } + obsoletedItems.insert (provider); + } } } } Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Wed Jul 16 01:12:56 2008 @@ -48,7 +48,6 @@ #include "zypp/repo/DeltaCandidates.h" #include "zypp/repo/PackageProvider.h" -#include "zypp/repo/ScriptProvider.h" #include "zypp/repo/SrcPackageProvider.h" #include "zypp/sat/Pool.h" Modified: trunk/libzypp/zypp/ui/UserWantedPackages.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/UserWantedPackages.cc?rev=10592&r1=10591&r2=10592&view=diff ============================================================================== --- trunk/libzypp/zypp/ui/UserWantedPackages.cc (original) +++ trunk/libzypp/zypp/ui/UserWantedPackages.cc Wed Jul 16 01:12:56 2008 @@ -61,7 +61,6 @@ template<class PkgSet_T> void addPkgSetPackages( set<string> & pkgNames ); static void addPatternPackages ( set<string> & pkgNames ); - static void addLanguagePackages ( set<string> & pkgNames ); static void addPatchPackages ( set<string> & pkgNames ); @@ -74,7 +73,6 @@ addDirectlySelectedPackages ( pkgNames ); addPatternPackages ( pkgNames ); - addLanguagePackages ( pkgNames ); addPatchPackages ( pkgNames ); return pkgNames; @@ -137,53 +135,6 @@ } - static void addLanguagePackages( set<string> & pkgNames ) - { -#warning NO MORE LANGUAGE RESOLVABLE -#if 0 - // Build a set of all languages that are to be transacted - - set<string> wantedLanguages; - - for ( PoolProxyIterator lang_it = langBegin(); - lang_it != langEnd(); - ++lang_it ) - { - if ( (*lang_it)->toModify() ) - { - DBG << "Language will be transacted: \"" << (*lang_it)->name() << "\"" << endl; - - wantedLanguages.insert( (*lang_it)->name() ); - } - } - - - // Check all packages if they support any of the wanted languages - - for ( PoolProxyIterator pkg_it = pkgBegin(); - pkg_it != pkgEnd(); - ++pkg_it ) - { - ResObject::constPtr obj = (*pkg_it)->theObj(); - - if ( obj ) - { - Capabilities freshens = obj->dep( Dep::FRESHENS ); - - for ( Capabilities::const_iterator cap_it = freshens.begin(); - cap_it != freshens.end(); - ++cap_it ) - { - if ( contains( wantedLanguages, (*cap_it).index() ) ) - pkgNames.insert( obj->name() ); - } - } - } -#endif - } - - - static void addPatchPackages( set<string> & pkgNames ) { for ( PoolProxyIterator patch_it = patchesBegin(); @@ -197,14 +148,11 @@ DBG << "Patch will be transacted: \"" << patch->name() << "\" - \"" << patch->summary() << "\"" << endl; - Patch::AtomList atomList = patch->atoms(); - - for ( Patch::AtomList::iterator atom_it = atomList.begin(); - atom_it != atomList.end(); - ++atom_it ) - { - pkgNames.insert( (*atom_it)->name() ); - } + Patch::Contents contents( patch->contents() ); + for_( it, contents.begin(), contents.end() ) + { + pkgNames.insert( it->name() ); + } } } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org