August 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10880 - /trunk/libzypp/package/libzypp.changes
by dmacvicar＠svn.opensuse.org 18 Aug '08

18 Aug '08

Author: dmacvicar Date: Mon Aug 18 17:41:32 2008 New Revision: 10880 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10880&view=rev Log: merge changes Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Aug 18 17:41:32 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 18 17:31:02 CEST 2008 - dmacvicar(a)suse.de + +- don't report "may be outdated" for @System repo. + +------------------------------------------------------------------- Fri Aug 15 20:20:07 CEST 2008 - ma(a)suse.de - Add Target::targetDistribution. Returns "distribution-arch" of @@ -32,11 +37,6 @@ - revision 10870 ------------------------------------------------------------------- -Mon Aug 18 17:31:02 CEST 2008 - dmacvicar(a)suse.de - -- don't report "may be outdated" for @System repo. - -------------------------------------------------------------------- Thu Aug 14 18:44:45 CEST 2008 - schubi(a)suse.de - Regarding error messages for Products correctly (FATE #304502) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10879 - /trunk/libzypp/package/libzypp.changes
by dmacvicar＠svn.opensuse.org 18 Aug '08

18 Aug '08

Author: dmacvicar Date: Mon Aug 18 17:40:24 2008 New Revision: 10879 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10879&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Aug 18 17:40:24 2008 @@ -32,6 +32,11 @@ - revision 10870 ------------------------------------------------------------------- +Mon Aug 18 17:31:02 CEST 2008 - dmacvicar(a)suse.de + +- don't report "may be outdated" for @System repo. + +------------------------------------------------------------------- Thu Aug 14 18:44:45 CEST 2008 - schubi(a)suse.de - Regarding error messages for Products correctly (FATE #304502) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10878 - /trunk/libzypp/zypp/Repository.cc
by dmacvicar＠svn.opensuse.org 18 Aug '08

18 Aug '08

Author: dmacvicar Date: Mon Aug 18 17:40:23 2008 New Revision: 10878 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10878&view=rev Log: - dont report outdated for the system repo Modified: trunk/libzypp/zypp/Repository.cc Modified: trunk/libzypp/zypp/Repository.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Repository.cc?rev=1… ============================================================================== --- trunk/libzypp/zypp/Repository.cc (original) +++ trunk/libzypp/zypp/Repository.cc Mon Aug 18 17:40:23 2008 @@ -78,9 +78,13 @@ while (::dataiterator_step(&di)); } else - ERR << "the extra does not exist in the repo" << endl; - - return Date(); + { + if ( isSystemRepo() ) + return 0; + ERR << "the attribute generated timestamp does not exist in the repo" << endl; + } + + return Date(); } @@ -104,14 +108,22 @@ while (::dataiterator_step(&di)); } else - ERR << "the extra does not exist in the repo" << endl; - - return Date(); + { + if ( isSystemRepo() ) + return 0; + ERR << "the attribute suggested expiration timestamp does not exist in the repo" << endl; + } + + return Date(); } bool Repository::maybeOutdated() const { + // system repo is not mirrored + if ( isSystemRepo() ) + return false; + return suggestedExpirationTimestamp() < Date::now(); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10877 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/NewPool.cc package/libzypp.changes zypp/Target.cc zypp/Target.h zypp/target/TargetImpl.cc zypp/target/TargetImpl.h
by mlandres＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: mlandres Date: Fri Aug 15 20:29:01 2008 New Revision: 10877 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10877&view=rev Log: - Add Target::targetDistribution. Returns "distribution-arch" of the installed base product. Used for registration and i Service refresh. (for Fate #304915) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Target.cc trunk/libzypp/zypp/Target.h trunk/libzypp/zypp/target/TargetImpl.cc trunk/libzypp/zypp/target/TargetImpl.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10877&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Aug 15 20:29:01 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "6") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.5.1 (5) +# LAST RELEASED: 5.6.0 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Fri Aug 15 20:29:01 2008 @@ -529,13 +529,13 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - // Pool of Selectables + // access to the Pool of Selectables ResPoolProxy selectablePool( ResPool::instance().proxy() ); // Iterate it's Products... for_( it, selectablePool.byKindBegin<Product>(), selectablePool.byKindEnd<Product>() ) { - // current Product Selectable + // The current Product Selectable ui::Selectable::Ptr prodSel( *it ); MIL << dump( prodSel ) << endl; @@ -550,7 +550,7 @@ // Iterate the replaced Products... for_( it, prodReplaces.begin(), prodReplaces.end() ) { - // current replaced Product + // The current replaced Product Product::constPtr replacedProduct( *it ); DBG << replacedProduct << endl; Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Aug 15 20:29:01 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Aug 15 20:20:07 CEST 2008 - ma(a)suse.de + +- Add Target::targetDistribution. Returns "distribution-arch" of + the installed base product. Used for registration and Service + refresh. (for Fate #304915) +- revision 10877 +- version 5.6.0 (5) + +------------------------------------------------------------------- Fri Aug 15 17:42:58 CEST 2008 - ma(a)suse.de - Add method Product::replacedProducts to identify installed Modified: trunk/libzypp/zypp/Target.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Target.cc?rev=10877… ============================================================================== --- trunk/libzypp/zypp/Target.cc (original) +++ trunk/libzypp/zypp/Target.cc Fri Aug 15 20:29:01 2008 @@ -100,9 +100,12 @@ std::string Target::release() const { return _pimpl->release(); } + std::string Target::targetDistribution() const + { return _pimpl->targetDistribution(); } + std::string Target::anonymousUniqueId() const { return _pimpl->anonymousUniqueId(); } - + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/Target.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Target.h?rev=10877&… ============================================================================== --- trunk/libzypp/zypp/Target.h (original) +++ trunk/libzypp/zypp/Target.h Fri Aug 15 20:29:01 2008 @@ -107,13 +107,18 @@ /** return the last modification date of the target */ Date timestamp() const; - /** The targets distribution release string. + /** The targets distribution release string (/etc/SuSE-release) * \code * openSUSE 10.3 (i586) * \endcode */ std::string release() const; + /** This is "distribution-arch" of the installed base product. + * Used for registration and \ref Service refresh. + */ + std::string targetDistribution() const; + /** * anonymous unique id * Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Fri Aug 15 20:29:01 2008 @@ -871,6 +871,30 @@ return _("Unknown Distribution"); } + std::string TargetImpl::targetDistribution() const + { + std::ifstream baseProduct( (_root / "/etc/products.d/baseproduct").c_str() ); + for( iostr::EachLine in( baseProduct ); in; in.next() ) + { + std::string line( str::trim( *in ) ); + if ( str::hasPrefix( line, "distribution" ) ) + { + std::string::size_type pos( line.find( '=', 12 ) ); + if ( pos == std::string::npos ) + continue; // no '=' on line + pos = line.find_first_not_of( " \t", pos+1 ); + if ( pos == std::string::npos ) + continue; // empty value + line.erase( 0, pos ); + line += "-"; + line += ZConfig::instance().systemArchitecture().asString(); + return line; + } + } + WAR << "No distribution in " << PathInfo(_root / "/etc/products.d/baseproduct") << endl; + return std::string(); + } + std::string TargetImpl::anonymousUniqueId() const { std::ifstream idfile( ( home() / "AnonymousUniqueId" ).c_str() ); Modified: trunk/libzypp/zypp/target/TargetImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.h… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.h (original) +++ trunk/libzypp/zypp/target/TargetImpl.h Fri Aug 15 20:29:01 2008 @@ -148,6 +148,11 @@ */ std::string release() const; + /** This is "distribution-arch" of the installed base product. + * Used for registration and \ref Service refresh. + */ + std::string targetDistribution() const; + protected: /** Path to the target */ Pathname _root; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10876 - in /trunk/libzypp: devel/devel.ma/ package/ zypp/ zypp/sat/ zypp/ui/
by mlandres＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: mlandres Date: Fri Aug 15 18:50:22 2008 New Revision: 10876 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10876&view=rev Log: - Add method Product::replacedProducts to identify installed Products that would be replaced by installing a new Product. Added: trunk/libzypp/zypp/sat/WhatObsoletes.cc trunk/libzypp/zypp/sat/WhatObsoletes.h Modified: trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/CMakeLists.txt trunk/libzypp/zypp/Product.cc trunk/libzypp/zypp/Product.h trunk/libzypp/zypp/sat/WhatProvides.cc trunk/libzypp/zypp/sat/WhatProvides.h trunk/libzypp/zypp/ui/Selectable.h trunk/libzypp/zypp/ui/SelectableTraits.h Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Fri Aug 15 18:50:22 2008 @@ -41,6 +41,7 @@ #include "zypp/sat/SolvableSet.h" #include "zypp/sat/SolvIterMixin.h" #include "zypp/sat/detail/PoolImpl.h" +#include "zypp/sat/WhatObsoletes.h" #include "zypp/PoolQuery.h" #include "zypp/parser/ProductConfReader.h" @@ -528,10 +529,42 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - testcase(); - MIL << "FOOO" << endl; + // Pool of Selectables + ResPoolProxy selectablePool( ResPool::instance().proxy() ); - /////////////////////////////////////////////////////////////////// + // Iterate it's Products... + for_( it, selectablePool.byKindBegin<Product>(), selectablePool.byKindEnd<Product>() ) + { + // current Product Selectable + ui::Selectable::Ptr prodSel( *it ); + MIL << dump( prodSel ) << endl; + + // It's candiate as Product pointer + Product::constPtr prod( prodSel->candidateAsKind<Product>() ); + if ( prod ) + { + // Not NULL, so there is an available Product. + // Get the installed Products it would replace. + Product::ReplacedProducts prodReplaces( prod->replacedProducts() ); + + // Iterate the replaced Products... + for_( it, prodReplaces.begin(), prodReplaces.end() ) + { + // current replaced Product + Product::constPtr replacedProduct( *it ); + DBG << replacedProduct << endl; + + // and this is how you would get the Selectable that contains + // this replacedProduct, in case you need it .. + ui::Selectable::Ptr replacedProductsSelectable( ui::Selectable::get( replacedProduct ) ); + DBG << replacedProductsSelectable << endl; + } + } + + } + + + /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); return 0; Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Aug 15 18:50:22 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Aug 15 17:42:58 CEST 2008 - ma(a)suse.de + +- Add method Product::replacedProducts to identify installed + Products that would be replaced by installing a new Product. + (for Fate #301997) +- revision 10876 + +------------------------------------------------------------------- Fri Aug 15 15:30:32 CEST 2008 - ma(a)suse.de - Fixes to Selectable doing staus manipulation on non-USER level. Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Fri Aug 15 18:50:22 2008 @@ -483,6 +483,7 @@ sat/SolvableSet.cc sat/SolvIterMixin.cc sat/WhatProvides.cc + sat/WhatObsoletes.cc sat/LocaleSupport.cc sat/LookupAttr.cc sat/SolvAttr.cc @@ -494,6 +495,7 @@ sat/SolvableSet.h sat/SolvIterMixin.h sat/WhatProvides.h + sat/WhatObsoletes.h sat/LocaleSupport.h sat/LookupAttr.h sat/SolvAttr.h Modified: trunk/libzypp/zypp/Product.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.cc?rev=1087… ============================================================================== --- trunk/libzypp/zypp/Product.cc (original) +++ trunk/libzypp/zypp/Product.cc Fri Aug 15 18:50:22 2008 @@ -17,6 +17,8 @@ #include "zypp/sat/LookupAttr.h" #include "zypp/sat/WhatProvides.h" +#include "zypp/sat/WhatObsoletes.h" +#include "zypp/PoolItem.h" using std::endl; @@ -70,10 +72,6 @@ {} /////////////////////////////////////////////////////////////////// - // - // Package interface forwarded to implementation - // - /////////////////////////////////////////////////////////////////// sat::Solvable Product::referencePackage() const { @@ -104,6 +102,35 @@ return sat::Solvable::noSolvable; } + Product::ReplacedProducts Product::replacedProducts() const + { + std::vector<constPtr> ret; + // By now we simply collect what is obsoleted by the Product, + // or by the products buddy (release-package). + + // Check our own dependencies. We should not have any, + // but just to be shure. + sat::WhatObsoletes obsoleting( satSolvable() ); + for_( it, obsoleting.begin(), obsoleting.end() ) + { + if ( it->isKind( ResKind::product ) ) + ret.push_back( make<Product>( *it ) ); + } + + // If we have a buddy, we check what product buddies the + // buddy replaces. + obsoleting = sat::WhatObsoletes( poolItem().buddy() ); + for_( it, obsoleting.poolItemBegin(), obsoleting.poolItemEnd() ) + { + if ( (*it).buddy().isKind( ResKind::product ) ) + ret.push_back( make<Product>( (*it).buddy() ) ); + } + + return ret; + } + + /////////////////////////////////////////////////////////////////// + std::string Product::shortName() const { return lookupStrAttribute( sat::SolvAttr::productShortlabel ); } Modified: trunk/libzypp/zypp/Product.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Product.h?rev=10876… ============================================================================== --- trunk/libzypp/zypp/Product.h (original) +++ trunk/libzypp/zypp/Product.h Fri Aug 15 18:50:22 2008 @@ -44,6 +44,15 @@ sat::Solvable referencePackage() const; public: + /***/ + typedef std::vector<constPtr> ReplacedProducts; + + /** Array of \b installed Products that would be replaced by + * installing this one. + */ + ReplacedProducts replacedProducts() const; + + public: /** Untranslated short name like <tt>SLES 10</tt>*/ std::string shortName() const; Added: trunk/libzypp/zypp/sat/WhatObsoletes.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatObsoletes.c… ============================================================================== --- trunk/libzypp/zypp/sat/WhatObsoletes.cc (added) +++ trunk/libzypp/zypp/sat/WhatObsoletes.cc Fri Aug 15 18:50:22 2008 @@ -0,0 +1,114 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/sat/WhatObsoletes.cc + * +*/ +#include <iostream> + +#include "zypp/base/LogTools.h" +#include "zypp/sat/WhatObsoletes.h" +#include "zypp/sat/detail/PoolImpl.h" +#include "zypp/PoolItem.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace sat + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + + /** WhatObsoletes ctor helper collecting obsoleted installed items. */ + shared_ptr<void> allocatedProviders( sat::Solvable item_r, const sat::detail::IdType *& first_r ) + { + WhatProvides obsoleted( item_r.obsoletes() ); + if ( obsoleted.empty() ) + { + return shared_ptr<void>(); + } + + // use allocated private data to store the result (incl. trailing NULL) + std::vector<sat::detail::IdType> * pdata = 0; + shared_ptr<void> ret; + + for_( it, obsoleted.begin(), obsoleted.end() ) + { + if ( it->isSystem() ) + { + if ( ! pdata ) + { + ret.reset( (pdata = new std::vector<sat::detail::IdType>) ); + } + pdata->push_back( it->id() ); + } + } + + if ( pdata ) + { + pdata->push_back( sat::detail::noId ); + first_r = &pdata->front(); + } + return ret; + } + + ///////////////////////////////////////////////////////////////// + } // namespace + /////////////////////////////////////////////////////////////////// + + WhatObsoletes::WhatObsoletes( Solvable item_r ) + : _begin( 0 ) + , _private( allocatedProviders( item_r, _begin ) ) + {} + + WhatObsoletes::WhatObsoletes( const PoolItem & item_r ) + : _begin( 0 ) + , _private( allocatedProviders( item_r.satSolvable(), _begin ) ) + {} + + WhatObsoletes::WhatObsoletes( const ResObject::constPtr item_r ) + : _begin( 0 ) + { + if ( item_r ) + _private = allocatedProviders( item_r->satSolvable(), _begin ); + } + + WhatObsoletes::size_type WhatObsoletes::size() const + { + if ( ! _begin ) + return 0; + + Capabilities::size_type ret = 0; + for ( const sat::detail::IdType * end = _begin; *end; ++end ) + { + ++ret; + } + return ret; + } + + /****************************************************************** + ** + ** FUNCTION NAME : operator<< + ** FUNCTION TYPE : std::ostream & + */ + std::ostream & operator<<( std::ostream & str, const WhatObsoletes & obj ) + { + return dumpRange( str << "(" << obj.size() << ")", obj.begin(), obj.end() ); + } + + ///////////////////////////////////////////////////////////////// + } // namespace sat + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/sat/WhatObsoletes.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatObsoletes.h… ============================================================================== --- trunk/libzypp/zypp/sat/WhatObsoletes.h (added) +++ trunk/libzypp/zypp/sat/WhatObsoletes.h Fri Aug 15 18:50:22 2008 @@ -0,0 +1,96 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/sat/WhatObsoletes.h + * +*/ +#ifndef ZYPP_SAT_WHATOBSOLETES_H +#define ZYPP_SAT_WHATOBSOLETES_H + +#include <iosfwd> +#include <vector> + +#include "zypp/sat/WhatProvides.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace sat + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : WhatObsoletes + // + /** Container of \b installed \ref Solvable which would be + * obsoleted by the \ref Solvable passed to the ctor. + * + * \code + * \endcode + */ + class WhatObsoletes : public SolvIterMixin<WhatObsoletes,detail::WhatProvidesIterator>, + protected detail::PoolMember + { + public: + typedef Solvable value_type; + typedef unsigned size_type; + + public: + /** Default ctor */ + WhatObsoletes() + : _begin( 0 ) + {} + + /** Ctor from \ref Solvable. */ + explicit + WhatObsoletes( Solvable item_r ); + + /** Ctor from \ref PoolItem. */ + explicit + WhatObsoletes( const PoolItem & item_r ); + + /** Ctor from \ref ResObject::constPtr. */ + explicit + WhatObsoletes( const ResObject_constPtr item_r ); + + public: + /** Whether the container is empty. */ + bool empty() const + { return ! ( _begin && *_begin ); } + + /** Number of solvables inside. */ + size_type size() const; + + public: + typedef detail::WhatProvidesIterator const_iterator; + + /** Iterator pointing to the first \ref Solvable. */ + const_iterator begin() const + { return const_iterator( _begin ); } + + /** Iterator pointing behind the last \ref Solvable. */ + const_iterator end() const + { return const_iterator( 0 ); } + + private: + const sat::detail::IdType * _begin; + shared_ptr<void> _private; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates WhatObsoletes Stream output */ + std::ostream & operator<<( std::ostream & str, const WhatObsoletes & obj ); + + ///////////////////////////////////////////////////////////////// + } // namespace sat + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_SAT_WHATOBSOLETES_H Modified: trunk/libzypp/zypp/sat/WhatProvides.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatProvides.cc… ============================================================================== --- trunk/libzypp/zypp/sat/WhatProvides.cc (original) +++ trunk/libzypp/zypp/sat/WhatProvides.cc Fri Aug 15 18:50:22 2008 @@ -48,8 +48,8 @@ return shared_ptr<void>(); } - // use allocated private data to store the result - std::vector<sat::detail::IdType> * pdata = new std::vector<sat::detail::IdType>( ids.size(), sat::detail::noId ); + // use allocated private data to store the result (incl. trailing NULL) + std::vector<sat::detail::IdType> * pdata = new std::vector<sat::detail::IdType>( ids.size()+1, sat::detail::noId ); pdata->insert( pdata->begin(), ids.begin(), ids.end() ); first_r = &pdata->front(); return shared_ptr<void>( pdata ); Modified: trunk/libzypp/zypp/sat/WhatProvides.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatProvides.h?… ============================================================================== --- trunk/libzypp/zypp/sat/WhatProvides.h (original) +++ trunk/libzypp/zypp/sat/WhatProvides.h Fri Aug 15 18:50:22 2008 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zypp/sat/.h +/** \file zypp/sat/WhatProvides.h * */ #ifndef ZYPP_SAT_WHATPROVIDES_H @@ -142,6 +142,7 @@ // CLASS NAME : WhatProvides::const_iterator // /** \ref WhatProvides iterator. + * Iterate a NULL terminated sat::detail::IdType array. */ class WhatProvidesIterator : public boost::iterator_adaptor< WhatProvidesIterator // Derived Modified: trunk/libzypp/zypp/ui/Selectable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/Selectable.h?rev… ============================================================================== --- trunk/libzypp/zypp/ui/Selectable.h (original) +++ trunk/libzypp/zypp/ui/Selectable.h Fri Aug 15 18:50:22 2008 @@ -124,6 +124,26 @@ */ PoolItem candidateObj() const; + /** Return the \ref installedObj resolvable casted to a specific kind. + * \code + * Selectable mySelectable; + * Package::constPtr p( mySelectable.installedAsKind<Package>() ); + * \endcode + */ + template<class _Res> + typename ResTraits<_Res>::constPtrType installedAsKind() const + { return asKind<_Res>( candidateObj() ); } + + /** Return the \ref candidateObj resolvable casted to a specific kind. + * \code + * Selectable mySelectable; + * Package::constPtr p( mySelectable.candidateAsKind<Package>() ); + * \endcode + */ + template<class _Res> + typename ResTraits<_Res>::constPtrType candidateAsKind() const + { return asKind<_Res>( candidateObj() ); } + /** Set a candidate (out of available objects). * \return The new candidate, or NULL if choice was invalid * (NULL or not among availableObjs). An invalid choice Modified: trunk/libzypp/zypp/ui/SelectableTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableTraits… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableTraits.h (original) +++ trunk/libzypp/zypp/ui/SelectableTraits.h Fri Aug 15 18:50:22 2008 @@ -17,7 +17,6 @@ #include "zypp/base/Iterator.h" #include "zypp/PoolItem.h" #include "zypp/pool/ByIdent.h" -//#include "zypp/ResObject.h" /////////////////////////////////////////////////////////////////// namespace zypp -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10875 - /trunk/sat-solver/package/libsatsolver.changes
by kkaempf＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: kkaempf Date: Fri Aug 15 16:29:38 2008 New Revision: 10875 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10875&view=rev Log: fix bnc#417594 Modified: trunk/sat-solver/package/libsatsolver.changes Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Aug 15 16:29:38 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 15 16:29:00 CEST 2008 - kkaempf(a)suse.de + +- ensure existance of product solvable in repo_content(bnc#417594) + +------------------------------------------------------------------- Fri Aug 15 15:00:32 CEST 2008 - kkaempf(a)suse.de - follow /etc/products.d/baseproduct and mark product as 'base' -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10874 - /trunk/sat-solver/tools/repo_content.c
by kkaempf＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: kkaempf Date: Fri Aug 15 16:28:52 2008 New Revision: 10874 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10874&view=rev Log: ensure existance of product solvable (bnc#417594) Modified: trunk/sat-solver/tools/repo_content.c Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Fri Aug 15 16:28:52 2008 @@ -238,7 +238,7 @@ for (;;) { char *fields[2]; - + /* read line into big-enough buffer */ if (linep - line + 16 > aline) { @@ -279,12 +279,6 @@ contentstyle = 10; } - if (code11 && istag ("REFERENCES")) - { - repo_set_id(repo, s - pool->solvables, PRODUCT_REFERENCES, str2id(pool, value, 1)); - continue; - } - if ((code10 && istag ("PRODUCT")) || (code11 && istag ("NAME"))) { @@ -306,7 +300,7 @@ continue; } - /* Sometimes PRODUCT is not the first entry, but we need a solvable + /* Sometimes PRODUCT/NAME is not the first entry, but we need a solvable from here on. */ if (!s) { @@ -314,11 +308,11 @@ repodata_extend(data, s - pool->solvables); handle = repodata_get_handle(data, s - pool->solvables - repo->start); } - if (istag ("VERSION")) - { - /* without a release? but that's like zypp implements it */ - s->evr = makeevr(pool, value); - } + + if (code11 && istag ("REFERENCES")) + repo_set_id(repo, s - pool->solvables, PRODUCT_REFERENCES, str2id(pool, value, 1)); + else if (istag ("VERSION")) + s->evr = makeevr(pool, value); else if (code11 && istag ("DISTRIBUTION")) repo_set_str(repo, s - pool->solvables, SOLVABLE_DISTRIBUTION, value); else if (code11 && istag ("FLAVOR")) @@ -342,9 +336,7 @@ else if (istag ("RELNOTESURL")) repodata_add_poolstr_array(data, handle, PRODUCT_RELNOTESURL, value); else if (istag ("VENDOR")) - { - s->vendor = str2id(pool, value, 1); - } + s->vendor = str2id(pool, value, 1); /* * Every tag below is Code10 only -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10873 - in /trunk/libzypp: package/libzypp.changes zypp/ui/Selectable.cc zypp/ui/Selectable.h zypp/ui/SelectableImpl.cc zypp/ui/SelectableImpl.h
by mlandres＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: mlandres Date: Fri Aug 15 15:39:10 2008 New Revision: 10873 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10873&view=rev Log: - Fixes to Selectable doing staus manipulation on non-USER level. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ui/Selectable.cc trunk/libzypp/zypp/ui/Selectable.h trunk/libzypp/zypp/ui/SelectableImpl.cc trunk/libzypp/zypp/ui/SelectableImpl.h Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Aug 15 15:39:10 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 15 15:30:32 CEST 2008 - ma(a)suse.de + +- Fixes to Selectable doing staus manipulation on non-USER level. +- revision 10873 + +------------------------------------------------------------------- Fri Aug 15 14:23:02 CEST 2008 - ma(a)suse.de - Add method ZYpp::getTarget that returns the Target or a NULL pointer, Modified: trunk/libzypp/zypp/ui/Selectable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/Selectable.cc?re… ============================================================================== --- trunk/libzypp/zypp/ui/Selectable.cc (original) +++ trunk/libzypp/zypp/ui/Selectable.cc Fri Aug 15 15:39:10 2008 @@ -73,8 +73,11 @@ PoolItem Selectable::candidateObj() const { return _pimpl->candidateObj(); } - PoolItem Selectable::setCandidate( ResObject::constPtr byUser_r ) - { return _pimpl->setCandidate( byUser_r ); } + PoolItem Selectable::setCandidate( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r ) + { return _pimpl->setCandidate( newCandidate_r, causer_r ); } + + PoolItem Selectable::setCandidate( ResObject::constPtr newCandidate_r, ResStatus::TransactByValue causer_r ) + { return _pimpl->setCandidate( PoolItem( newCandidate_r ), causer_r ); } PoolItem Selectable::theObj() const { return _pimpl->theObj(); } Modified: trunk/libzypp/zypp/ui/Selectable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/Selectable.h?rev… ============================================================================== --- trunk/libzypp/zypp/ui/Selectable.h (original) +++ trunk/libzypp/zypp/ui/Selectable.h Fri Aug 15 15:39:10 2008 @@ -128,8 +128,13 @@ * \return The new candidate, or NULL if choice was invalid * (NULL or not among availableObjs). An invalid choice * selects the default candidate. - */ - PoolItem setCandidate( ResObject::constPtr byUser_r ); + * In case the causer is not \c ResStatus::USER the operation + * may also fail if there are insufficient permissions to change + * a transacting candidate. + */ + PoolItem setCandidate( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r = ResStatus::USER ); + /** \overload */ + PoolItem setCandidate( ResObject::constPtr newCandidate_r, ResStatus::TransactByValue causer_r = ResStatus::USER ); /** Best among all objects. */ PoolItem theObj() const; Modified: trunk/libzypp/zypp/ui/SelectableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.c… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.cc (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.cc Fri Aug 15 15:39:10 2008 @@ -283,35 +283,44 @@ return false; } - PoolItem Selectable::Impl::setCandidate( ResObject::constPtr byUser_r ) + PoolItem Selectable::Impl::setCandidate( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r ) { - _candidate = PoolItem(); + PoolItem newCandidate; - if ( byUser_r ) // must be in available list + if ( newCandidate_r ) // must be in available list + { + for_( it, availableBegin(), availableEnd() ) { - for ( available_const_iterator it = availableBegin(); - it != availableEnd(); ++it ) - { - if ( it->resolvable() == byUser_r ) - { - _candidate = *it; - break; - } - } + if ( *it == newCandidate_r ) + { + newCandidate = *it; + break; + } } + } - if ( _candidate ) + if ( newCandidate ) + { + PoolItem trans( transactingCandidate() ); + if ( trans && trans != newCandidate ) { - PoolItem trans( transactingCandidate() ); - if ( trans && trans != _candidate ) - { - // adjust transact to the new cancidate - trans.status().setTransact( false, ResStatus::USER ); - _candidate.status().setTransact( true, ResStatus::USER ); - } + // adjust transact to the new cancidate + if ( trans.status().maySetTransact( false, causer_r ) + && newCandidate.status().maySetTransact( true, causer_r ) ) + { + trans.status().setTransact( false, causer_r ); + newCandidate.status().setTransact( true, causer_r ); + } + else + { + // No permission to change a transacting candidate. + // Leave _candidate untouched and return NULL. + return PoolItem(); + } } + } - return _candidate; + return _candidate = newCandidate; } ResStatus::TransactByValue Selectable::Impl::modifiedBy() const Modified: trunk/libzypp/zypp/ui/SelectableImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.h… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.h (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.h Fri Aug 15 15:39:10 2008 @@ -68,7 +68,6 @@ else _availableItems.insert( *it ); } - setCandidate( NULL ); } public: @@ -117,7 +116,7 @@ * \return The new userCandidate or NULL if choice was invalid * (not among availableObjs). */ - PoolItem setCandidate( ResObject::constPtr byUser_r ); + PoolItem setCandidate( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r ); /** Best among all objects. */ PoolItem theObj() const -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10872 - in /trunk/sat-solver: package/libsatsolver.changes tools/repo_products.c
by kkaempf＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: kkaempf Date: Fri Aug 15 15:01:46 2008 New Revision: 10872 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10872&view=rev Log: - follow /etc/products.d/baseproduct and mark product as 'product:type = base' Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/tools/repo_products.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.… ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Aug 15 15:01:46 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 15 15:00:32 CEST 2008 - kkaempf(a)suse.de + +- follow /etc/products.d/baseproduct and mark product as 'base' + +------------------------------------------------------------------- Fri Aug 15 14:26:29 CEST 2008 - kkaempf(a)suse.de - Implement pre-code11 fallback for products, parse /etc/*-release Modified: trunk/sat-solver/tools/repo_products.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.c… ============================================================================== --- trunk/sat-solver/tools/repo_products.c (original) +++ trunk/sat-solver/tools/repo_products.c Fri Aug 15 15:01:46 2008 @@ -28,6 +28,9 @@ #include "tools_util.h" #include "repo_content.h" + +static ino_t baseproduct = 0; + struct parsedata { Repo *repo; char *tmp; @@ -225,6 +228,9 @@ if (!fstat(fileno(fp), &st)) { repodata_set_num(data, handle, SOLVABLE_INSTALLTIME, st.st_ctime); + /* this is where <productsdir>/baseproduct points to */ + if (st.st_ino == baseproduct) + repodata_set_str(data, handle, PRODUCT_TYPE, "base"); } else { @@ -292,6 +298,14 @@ struct dirent *entry; char *suffix = code11 ? ".prod" : "-release"; int slen = code11 ? 5 : 8; /* strlen(".prod") : strlen("-release") */ + struct stat st; + + /* check for <productsdir>/baseproduct on code11 and remember its target inode */ + if (code11 + && stat(join2(path, "/", "baseproduct"), &st) == 0) /* follow symlink */ + { + baseproduct = st.st_ino; + } while ((entry = readdir(dir))) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10871 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/Target.h zypp/ZYpp.cc zypp/ZYpp.h zypp/solver/detail/SystemCheck.cc zypp/zypp_detail/ZYppImpl.h
by mlandres＠svn.opensuse.org 15 Aug '08

15 Aug '08

Author: mlandres Date: Fri Aug 15 14:30:44 2008 New Revision: 10871 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10871&view=rev Log: - Add method ZYpp::getTarget that returns the Target or a NULL pointer, if it is not yet initialized. This is to avoid try/catch blocks just to test whether the Target is initialized. (bnc #417556) - Add method Target::assertRootPrefix. Pass a pathname and get back the path prefixed with the tragets root, unless it already had that prefix. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Target.h trunk/libzypp/zypp/ZYpp.cc trunk/libzypp/zypp/ZYpp.h trunk/libzypp/zypp/solver/detail/SystemCheck.cc trunk/libzypp/zypp/zypp_detail/ZYppImpl.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10871&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Aug 15 14:30:44 2008 @@ -60,8 +60,8 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "5") -SET(LIBZYPP_MINOR "5") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_MINOR "6") +SET(LIBZYPP_PATCH "0") # # LAST RELEASED: 5.5.1 (5) # (The number in parenthesis is LIBZYPP_COMPATMINOR) Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Aug 15 14:30:44 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Aug 15 14:23:02 CEST 2008 - ma(a)suse.de + +- Add method ZYpp::getTarget that returns the Target or a NULL pointer, + if it is not yet initialized. This is to avoid try/catch blocks just + to test whether the Target is initialized. (bnc #417556) +- Add method Target::assertRootPrefix. Pass a pathname and get back the + path prefixed with the tragets root, unless it already had that prefix. +- revision 10870 + +------------------------------------------------------------------- Thu Aug 14 18:44:45 CEST 2008 - schubi(a)suse.de - Regarding error messages for Products correctly (FATE #304502) Modified: trunk/libzypp/zypp/Target.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Target.h?rev=10871&… ============================================================================== --- trunk/libzypp/zypp/Target.h (original) +++ trunk/libzypp/zypp/Target.h Fri Aug 15 14:30:44 2008 @@ -100,6 +100,10 @@ /** Return the root set for this target */ Pathname root() const; + /** Return the path prefixed by the target root, unless it already is prefixed. */ + Pathname assertRootPrefix( const Pathname & path_r ) const + { return Pathname::assertprefix( root(), path_r ); } + /** return the last modification date of the target */ Date timestamp() const; @@ -119,7 +123,7 @@ * */ std::string anonymousUniqueId() const; - + public: /** Ctor. If \c doRebuild_r is \c true, an already existing * database is rebuilt (rpm --rebuilddb ). Modified: trunk/libzypp/zypp/ZYpp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYpp.cc?rev=10871&r… ============================================================================== --- trunk/libzypp/zypp/ZYpp.cc (original) +++ trunk/libzypp/zypp/ZYpp.cc Fri Aug 15 14:30:44 2008 @@ -85,6 +85,9 @@ Target_Ptr ZYpp::target() const { return _pimpl->target(); } + Target_Ptr ZYpp::getTarget() const + { return _pimpl->getTarget(); } + void ZYpp::initializeTarget( const Pathname & root, bool doRebuild_r ) { _pimpl->initializeTarget( root, doRebuild_r ); } Modified: trunk/libzypp/zypp/ZYpp.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYpp.h?rev=10871&r1… ============================================================================== --- trunk/libzypp/zypp/ZYpp.h (original) +++ trunk/libzypp/zypp/ZYpp.h Fri Aug 15 14:30:44 2008 @@ -84,6 +84,11 @@ */ Target_Ptr target() const; + /** Same as \ref target but returns NULL if target is not + * initialized, instead of throwing. + */ + Target_Ptr getTarget() const; + /** * \throws Exception * Just init the target, dont populate store or pool. Modified: trunk/libzypp/zypp/solver/detail/SystemCheck.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Syste… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SystemCheck.cc (original) +++ trunk/libzypp/zypp/solver/detail/SystemCheck.cc Fri Aug 15 14:30:44 2008 @@ -40,8 +40,8 @@ static SystemCheck _val; return _val; } - - + + SystemCheck::SystemCheck() { if (_file.empty()) { _file = ZConfig::instance().solver_checkSystemFile(); @@ -69,26 +69,19 @@ } bool SystemCheck::loadFile() const{ - try - { - Target_Ptr trg( getZYpp()->target() ); - if ( trg ) - _file = trg->root() / _file; - } - catch ( ... ) - { - // noop: Someone decided to let target() throw if the ptr is NULL ;( - } + Target_Ptr trg( getZYpp()->getTarget() ); + if ( trg ) + _file = trg->assertRootPrefix( _file ); PathInfo pi( _file ); if ( ! pi.isFile() ) { WAR << "Can't read " << _file << " " << pi << endl; return false; } - + _require.clear(); _conflict.clear(); - + std::ifstream infile( _file.c_str() ); for( iostr::EachLine in( infile ); in; in.next() ) { std::string l( str::trim(*in) ); @@ -113,7 +106,7 @@ MIL << "Read " << pi << endl; return true; } - + /****************************************************************** ** Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImp… ============================================================================== --- trunk/libzypp/zypp/zypp_detail/ZYppImpl.h (original) +++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.h Fri Aug 15 14:30:44 2008 @@ -69,6 +69,12 @@ */ Target_Ptr target() const; + /** Same as \ref target but returns NULL if target is not + * initialized, instead of throwing. + */ + Target_Ptr getTarget() const + { return _target; } + /** * \throws Exception * true, just init the target, dont populate store or pool -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0