January 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8418 - /branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt
by mlandres＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: mlandres Date: Thu Jan 31 11:49:42 2008 New Revision: 8418 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8418&view=rev Log: type Modified: branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt Modified: branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/CMakeLists.txt Thu Jan 31 11:49:42 2008 @@ -142,7 +142,7 @@ ResKind.h ResFilters.h ResObject.h - ResObjectsh + ResObjects.h ResPool.h ResPoolProxy.h ResStatus.h -- 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] r8417 - /branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc
by mlandres＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: mlandres Date: Wed Jan 30 17:11:44 2008 New Revision: 8417 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8417&view=rev Log: add missing extern C Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc Wed Jan 30 17:11:44 2008 @@ -11,7 +11,10 @@ #include "zypp/cache/CacheException.h" #include "zypp/cache/CacheAttributes.h" -#include "satsolver/repo.h" +extern "C" +{ +#include <satsolver/repo.h> +} using namespace std; using namespace zypp; @@ -56,7 +59,7 @@ , _cachedir(solvdir) { _pool = pool_create(); - _repo = repo_create(_pool, alias.c_str() ); + _repo = ::repo_create(_pool, alias.c_str() ); _repodata = repo_add_repodata(_repo); //_attr_resobject_summary = str2id(_pool, "summary"); -- 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] r8416 - /branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc
by schubi2＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: schubi2 Date: Wed Jan 30 17:08:27 2008 New Revision: 8416 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8416&view=rev Log: type Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc Wed Jan 30 17:08:27 2008 @@ -255,7 +255,7 @@ Pathname ZConfig::vendorPath() const { return ( _pimpl->cfg_vendor_path.empty() - ? Pathname("/etc/zypp/vondors.d") : _pimpl->cfg_vendor_path ); + ? Pathname("/etc/zypp/vendors.d") : _pimpl->cfg_vendor_path ); } ///////////////////////////////////////////////////////////////// -- 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] r8415 - in /branches/tmp/ma/jump_sat/libzypp: zypp.conf zypp/PoolItem.cc zypp/PoolItem.h zypp/VendorAttr.cc zypp/VendorAttr.h zypp/ZConfig.cc zypp/ZConfig.h zypp/solver/detail/ResolverUpgrade.cc
by schubi2＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: schubi2 Date: Wed Jan 30 17:08:00 2008 New Revision: 8415 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8415&view=rev Log: - vendor handling by "group vendors" - removed trusted vendor stuff - configuration of equivalent vendors in /etc/zypp/vendors.d Modified: branches/tmp/ma/jump_sat/libzypp/zypp.conf branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.cc branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.h branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.h branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp.… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp.conf (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp.conf Wed Jan 30 17:08:00 2008 @@ -116,14 +116,11 @@ # download.use_deltarpm = true -[locking] - - -## DEPRECATED -## Mimic old-fashioned behavior of locking all foreign vendor packages. +## +## Defining directory for equivalent vendors ## -## Valid values: boolean -## Default value: false +## Valid values: A directory +## Default value: /etc/zypp/vondors.d ## -# autolock_untrustedvendor = false +# vendordir = /etc/zypp/vondors.d Modified: branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.cc Wed Jan 30 17:08:00 2008 @@ -37,27 +37,14 @@ : _status( status_r ) , _resolvable( res_r ) { - autoprotect(); } ResStatus & status() const { return _status; } - ResStatus & statusReset() const - { - if ( ! autoprotect() ) - { - _status.setLock( false, zypp::ResStatus::USER ); - _status.resetTransact( zypp::ResStatus::USER ); - } - return _status; - } - ResObject::constPtr resolvable() const { return _resolvable; } - bool autoprotect() const; - private: mutable ResStatus _status; ResObject::constPtr _resolvable; @@ -105,19 +92,6 @@ return str; } - inline bool PoolItem::Impl::autoprotect() const - { - if ( _status.isInstalled() - && isKind<Package>( _resolvable ) - && VendorAttr::instance().autoProtect( _resolvable->vendor() ) ) - { - _status.setLock( true, zypp::ResStatus::USER ); - MIL << "Protect vendor '" << _resolvable->vendor() << "' " << *this << endl; - return true; - } - return false; - } - /////////////////////////////////////////////////////////////////// // // CLASS NAME : PoolItem @@ -168,9 +142,6 @@ ResStatus & PoolItem::status() const { return _pimpl->status(); } - ResStatus & PoolItem::statusReset() const - { return _pimpl->statusReset(); } - ResObject::constPtr PoolItem::resolvable() const { return _pimpl->resolvable(); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/PoolItem.h Wed Jan 30 17:08:00 2008 @@ -66,9 +66,6 @@ /** Returns the current status. */ ResStatus & status() const; - /** Reset status (applies autoprotection). */ - ResStatus & statusReset() const; - /** Returns the ResObject::constPtr. * \see \ref operator-> */ Modified: branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc Wed Jan 30 17:08:00 2008 @@ -20,6 +20,7 @@ #include <fstream> #include <set> #include <map> +#include <vector> #include "zypp/base/LogTools.h" #include "zypp/base/IOStream.h" @@ -30,6 +31,8 @@ #include "zypp/ZYppFactory.h" #include "zypp/ZConfig.h" +#include "zypp/PathInfo.h" +#include "zypp/parser/IniDict.h" using namespace std; @@ -44,130 +47,216 @@ namespace { ///////////////////////////////////////////////////////////////// - typedef std::map<Vendor,bool> TrustMap; - TrustMap _trustMap; - - typedef std::set<std::string> VendorList; - VendorList _trustedVendors; + typedef map<Vendor,unsigned int> VendorMap; + typedef vector<string> VendorList; + + VendorMap _vendorMap; + VendorMap _matchMap; + unsigned int vendorGroupCounter; - bool addTrustedVendor( const std::string & str_r ) + void addEquivalentVendors( VendorList & vendorList ) { - std::string line( str::trim( str_r ) ); - if ( ! line.empty() && line[0] != '#') - { - _trustedVendors.insert( str::toLower( line ) ); - } - return true; + unsigned int nextId = vendorGroupCounter + 1; + // convert to lowercase and check if a vendor is already defined + // in an existing group. + + for (VendorList::iterator it = vendorList.begin(); + it != vendorList.end(); + it++) { + *it = str::toLower( *it ); + if (_vendorMap.find(*it) != _vendorMap.end()) { + if (nextId != vendorGroupCounter + 1 && + nextId != _vendorMap[*it]) { + // We have at least 3 groups which has to be mixed --> mix the third group to the first + unsigned int moveID = _vendorMap[*it]; + for (VendorMap::iterator itMap = _vendorMap.begin(); + itMap != _vendorMap.end(); + itMap++) { + if (itMap->second == moveID) + itMap->second = nextId; + } + } else { + nextId = _vendorMap[*it]; + WAR << "Vendor " << *it << " is already used in another vendor group. --> mixing these groups" + << endl; + } + } + } + // add new entries + for (VendorList::iterator it = vendorList.begin(); + it != vendorList.end(); + it++) { + _vendorMap[*it] = nextId; + } + + if (nextId == vendorGroupCounter + 1) + vendorGroupCounter++; } - bool trusted( const Vendor & vendor_r ) - { - TrustMap::value_type val( vendor_r, false ); - pair<TrustMap::iterator, bool> res = _trustMap.insert( val ); - if ( res.second ) - { - // check the new vendor in map - for ( VendorList::const_iterator it = _trustedVendors.begin(); - it != _trustedVendors.end(); ++it ) - { - if ( str::toLower( res.first->first.substr( 0, it->size() ) ) - == str::toLower( *it ) ) - { - // match - res.first->second = true; - break; - } - } - } - return res.first->second; - } ///////////////////////////////////////////////////////////////// } // namespace /////////////////////////////////////////////////////////////////// const VendorAttr & VendorAttr::instance() { - static VendorAttr _val; - return _val; + static VendorAttr _val; + return _val; } VendorAttr::VendorAttr () { - const char * vendors[] = { - "jpackage project", - "novell", - "opensuse", - "sgi", - "silicon graphics", - "suse", - "ati technologies inc.", - "nvidia" - }; - _trustedVendors.insert( vendors, vendors+(sizeof(vendors)/sizeof(const char *)) ); - - Pathname vendorrcPath( "/etc/zypp/trustedVendors" ); - try - { - Target_Ptr trg( getZYpp()->target() ); - if ( trg ) - vendorrcPath = trg->root() / vendorrcPath; - } - catch ( ... ) - { - // noop: Someone decided to let target() throw if the ptr is NULL ;( - } - - PathInfo vendorrc( vendorrcPath ); - if ( vendorrc.isFile() ) - { - MIL << "Reading " << vendorrc << endl; - ifstream inp( vendorrc.asString().c_str() ); - iostr::forEachLine( inp, addTrustedVendor ); + vendorGroupCounter = 1; + + Pathname vendorPath (ZConfig::instance().vendorPath()); + try + { + Target_Ptr trg( getZYpp()->target() ); + if ( trg ) + vendorPath = trg->root() / vendorPath; + } + catch ( ... ) + { + // noop: Someone decided to let target() throw if the ptr is NULL ;( } - MIL << "Trusted Vendors: " << _trustedVendors << endl; - } - void VendorAttr::enableAutoProtect() - { - MIL << "FIXME: Not implemented." << endl; - // FIXME use ZConfig - } + // creating entries + addVendorDirectory (vendorPath); - void VendorAttr::disableAutoProtect() - { - MIL << "FIXME: Not implemented." << endl; - // FIXME use ZConfig + //checking if suse,opensuse has been defined. If not create entries + if (_vendorMap.find("suse") != _vendorMap.end()) { + if (_vendorMap.find("opensuse") == _vendorMap.end()) { + _vendorMap["opensuse"] = ++vendorGroupCounter; + } + } else { + if (_vendorMap.find("opensuse") == _vendorMap.end()) { + // both are not available. Create one group with suse,opensuse + _vendorMap["opensuse"] = ++vendorGroupCounter; + _vendorMap["suse"] = vendorGroupCounter; + } else { + _vendorMap["suse"] = ++vendorGroupCounter; + } + } + } - bool VendorAttr::isKnown( const Vendor & vendor_r ) const - { return trusted( vendor_r ); } - + bool VendorAttr::addVendorFile( const Pathname & filename ) const + { + parser::IniDict dict; + + if ( PathInfo(filename).isExist()) + { + InputStream is(filename); + dict.read(is); + } + else + { + MIL << filename << " not found." << endl; + return false; + } - bool VendorAttr::autoProtect( const Vendor & vendor_r ) const - { return( ZConfig::instance().autolock_untrustedvendor() && ! trusted( vendor_r ) ); } + for ( parser::IniDict::section_const_iterator sit = dict.sectionsBegin(); + sit != dict.sectionsEnd(); + ++sit ) + { + string section(*sit); + //MIL << section << endl; + for ( parser::IniDict::entry_const_iterator it = dict.entriesBegin(*sit); + it != dict.entriesEnd(*sit); + ++it ) + { + string entry(it->first); + string value(it->second); + if ( section == "main" ) + { + if ( entry == "vendors" ) + { + VendorList vendorlist; + str::split( value, back_inserter(vendorlist), "," ); + addEquivalentVendors (vendorlist); + break; + } + } + } + } - /** Helper: Lowercase prefix */ - inline bool hasLcPrefix( const std::string & str_r, const std::string & pref_r ) - { return str::toLower( str_r.substr( 0, pref_r.size() ) ) == pref_r; } + MIL << "Equivalent vendors:" << endl; + for (VendorMap::iterator it = _vendorMap.begin(); + it != _vendorMap.end(); + it ++) { + MIL << " " << it->first << "(group " << it->second << ")" << endl; + } + + return true; + } - /** Helper: SuSE and equivalent vendors */ - inline bool isSUSE( const Vendor & vnd_r ) + bool VendorAttr::addVendorDirectory( const Pathname & dirname ) const { - static const std::string defSUSE ( "suse" ); - static const std::string defopenSUSE( "opensuse" ); + parser::IniDict dict; + + if ( PathInfo(dirname).isExist()) + { + InputStream is(dirname); + dict.read(is); + } + else + { + MIL << dirname << " not found." << endl; + return false; + } - return( hasLcPrefix( vnd_r, defSUSE ) - || hasLcPrefix( vnd_r, defopenSUSE ) ); + list<Pathname> filenames; + + filesystem::readdir( filenames, + dirname, false ); + for (list<Pathname>::iterator it = filenames.begin(); + it != filenames.end(); it++) { + MIL << "Adding file " << *it << endl; + addVendorFile( *it ); + } + return true; } + bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const { - if ( lhs == rhs ) - return true; + if ( lhs == rhs ) + return true; - // By now handcrafted equivalence definition: - return( isSUSE( lhs ) && isSUSE( rhs ) ); + unsigned int lhsID = 0; + unsigned int rhsID = 0; + + if (_matchMap.find(lhs) != _matchMap.end()) { + lhsID = _matchMap[lhs]; + } else { + // compare this entry with the vendor map + for (VendorMap::reverse_iterator it = _vendorMap.rbegin(); + it != _vendorMap.rend(); + it++) { + if (lhs.substr (0, it->first.size()) == it->first) { + lhsID = it->second; + _matchMap[lhs] = lhsID; + break; // exit for + } + } + } + + if (_matchMap.find(rhs) != _matchMap.end()) { + rhsID = _matchMap[rhs]; + } else { + // compare this entry with the vendor map + for (VendorMap::reverse_iterator it = _vendorMap.rbegin(); + it != _vendorMap.rend(); + it++) { + if (rhs.substr (0, it->first.size()) == it->first) { + rhsID = it->second; + _matchMap[rhs] = rhsID; + break; // exit for + } + } + } + + return( lhsID == lhsID ); } ///////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h Wed Jan 30 17:08:00 2008 @@ -17,6 +17,7 @@ #include "zypp/base/NonCopyable.h" #include "zypp/NeedAType.h" +#include "zypp/PathInfo.h" /////////////////////////////////////////////////////////////////// namespace zypp { @@ -28,29 +29,15 @@ /** Singleton */ static const VendorAttr & instance(); - /** Enable autoprotection of foreign vendor packages. - * This is the default. - * \note This will \b not change the status of already - * loaded pool items. - */ - static void enableAutoProtect(); - /** Disable autoprotection of foreign vendor packages. - * Autoprotection is on per defult. - * \note This will \b not change the status of already - * loaded pool items. - */ - static void disableAutoProtect(); - /** - * Return whether it's a known vendor + * Adding new equivalent vendors described in a directory **/ - bool isKnown( const Vendor & vendor_r ) const; + bool addVendorDirectory( const Pathname & dirname ) const; /** - * Return whether this vendors packages should be - * protected by default. + * Adding new equivalent vendors described in a file **/ - bool autoProtect( const Vendor & vendor_r ) const; + bool addVendorFile( const Pathname & filename) const; /** Return whether two vendor strings shold be treated as the same vendor. * Usually the solver is allowed to automatically select a package of an Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc Wed Jan 30 17:08:00 2008 @@ -44,7 +44,6 @@ , repo_refresh_delay ( 10 ) , download_use_patchrpm ( true ) , download_use_deltarpm ( true ) - , autolock_untrustedvendor( false ) { MIL << "ZConfig singleton created." << endl; @@ -112,9 +111,9 @@ download_use_deltarpm = str::strToBool( value, download_use_deltarpm ); } } - else if ( section == "locking" ) + else if ( section == "vendordir" ) { - autolock_untrustedvendor = str::strToBool( value, autolock_untrustedvendor ); + cfg_vendor_path = Pathname(value); } } @@ -133,6 +132,7 @@ Pathname cfg_metadata_path; Pathname cfg_cache_path; Pathname cfg_known_repos_path; + Pathname cfg_vendor_path; bool repo_add_probe; unsigned repo_refresh_delay; @@ -140,8 +140,6 @@ bool download_use_patchrpm; bool download_use_deltarpm; - // [locking] - bool autolock_untrustedvendor; }; /////////////////////////////////////////////////////////////////// @@ -254,9 +252,10 @@ bool ZConfig::download_use_deltarpm() const { return _pimpl->download_use_deltarpm; } - bool ZConfig::autolock_untrustedvendor() const + Pathname ZConfig::vendorPath() const { - return _pimpl->autolock_untrustedvendor; + return ( _pimpl->cfg_vendor_path.empty() + ? Pathname("/etc/zypp/vondors.d") : _pimpl->cfg_vendor_path ); } ///////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.h Wed Jan 30 17:08:00 2008 @@ -105,11 +105,9 @@ bool download_use_deltarpm() const; /** - * Whether untrusted vendor should be autolocked - / config option - * repo.add.probe + * Directory for equivalent vendor definitions */ - bool autolock_untrustedvendor() const; + Pathname vendorPath() const; public: class Impl; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/ResolverUpgrade.cc Wed Jan 30 17:08:00 2008 @@ -126,7 +126,7 @@ DBG << "Candidate vendor '" << cpkg->vendor() << "'" << endl; if (cpkg - && VendorAttr::instance().isKnown( cpkg->vendor() ) ) + && VendorAttr::instance().equivalent( ipkg->vendor(), cpkg->vendor() ) ) { if ( silent_downgrades ) return true; -- 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] r8414 - /trunk/libzypp/zypp/sat/SATResolver.cc
by schubi2＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: schubi2 Date: Wed Jan 30 16:16:15 2008 New Revision: 8414 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8414&view=rev Log: fixed wrong parameters Modified: trunk/libzypp/zypp/sat/SATResolver.cc Modified: trunk/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SATResolver.cc?… ============================================================================== --- trunk/libzypp/zypp/sat/SATResolver.cc (original) +++ trunk/libzypp/zypp/sat/SATResolver.cc Wed Jan 30 16:16:15 2008 @@ -790,14 +790,14 @@ problemSolution->addDescription (description); gotone = 1; } - if (!solv->allowarchchange && s->name == sd->name && s->arch != sd->arch && policy_illegal_archchange(pool, s, sd)) + if (!solv->allowarchchange && s->name == sd->name && s->arch != sd->arch && policy_illegal_archchange(solv, s, sd)) { string description = str::form (_("architecture change of %s to %s"), solvable2str(pool, s), solvable2str(pool, sd)); MIL << description << endl; problemSolution->addDescription (description); gotone = 1; } - if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && policy_illegal_vendorchange(pool, s, sd)) + if (!solv->allowvendorchange && s->name == sd->name && s->vendor != sd->vendor && policy_illegal_vendorchange(solv, s, sd)) { string description = str::form (_("vendor change of [%s]%s to [%s]%s") , id2str(pool, s->vendor) , solvable2str(pool, s), string(sd->vendor ? id2str(pool, sd->vendor) : " (no vendor) ").c_str(), solvable2str(pool, sd)); -- 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] r8413 - in /trunk/sat-solver: src/pool.c src/pool.h src/repo.c src/solver.c testsuite/deptestomatic.c
by mlschroe＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: mlschroe Date: Wed Jan 30 15:56:38 2008 New Revision: 8413 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8413&view=rev Log: - use namespace instead of solvable for languages (breaks some test cases, solv files have to be regenerated) Modified: trunk/sat-solver/src/pool.c trunk/sat-solver/src/pool.h trunk/sat-solver/src/repo.c trunk/sat-solver/src/solver.c trunk/sat-solver/testsuite/deptestomatic.c Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=8413&r… ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Wed Jan 30 15:56:38 2008 @@ -55,6 +55,7 @@ "namespace:installed", "namespace:modalias", "namespace:splitprovides", + "namespace:language", "system:system", "src", "nosrc", Modified: trunk/sat-solver/src/pool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.h?rev=8413&r… ============================================================================== --- trunk/sat-solver/src/pool.h (original) +++ trunk/sat-solver/src/pool.h Wed Jan 30 15:56:38 2008 @@ -47,15 +47,16 @@ #define NAMESPACE_INSTALLED 18 #define NAMESPACE_MODALIAS 19 #define NAMESPACE_SPLITPROVIDES 20 -#define SYSTEM_SYSTEM 21 -#define ARCH_SRC 22 -#define ARCH_NOSRC 23 -#define ARCH_NOARCH 24 -#define REPODATA_EXTERNAL 25 -#define REPODATA_KEYS 26 -#define REPODATA_LOCATION 27 +#define NAMESPACE_LANGUAGE 21 +#define SYSTEM_SYSTEM 22 +#define ARCH_SRC 23 +#define ARCH_NOSRC 24 +#define ARCH_NOARCH 25 +#define REPODATA_EXTERNAL 26 +#define REPODATA_KEYS 27 +#define REPODATA_LOCATION 28 -#define ID_NUM_INTERNAL 28 +#define ID_NUM_INTERNAL 29 /* well known solvable */ Modified: trunk/sat-solver/src/repo.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.c?rev=8413&r… ============================================================================== --- trunk/sat-solver/src/repo.c (original) +++ trunk/sat-solver/src/repo.c Wed Jan 30 15:56:38 2008 @@ -346,9 +346,14 @@ dep = p + 1; continue; } - strncpy(dep - 9, "language:", 9); *p++ = 0; +#if 0 + strncpy(dep - 9, "language:", 9); idl = str2id(pool, dep - 9, 1); +#else + idl = str2id(pool, dep, 1); + idl = rel2id(pool, NAMESPACE_LANGUAGE, idl, REL_NAMESPACE, 1); +#endif if (id) id = rel2id(pool, id, idl, REL_OR, 1); else @@ -360,8 +365,13 @@ for (p = dep; *p && *p != ')'; p++) ; *p = 0; +#if 0 strncpy(dep - 9, "language:", 9); idl = str2id(pool, dep - 9, 1); +#else + idl = str2id(pool, dep, 1); + idl = rel2id(pool, NAMESPACE_LANGUAGE, idl, REL_NAMESPACE, 1); +#endif if (id) id = rel2id(pool, id, idl, REL_OR, 1); else Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=8413… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Jan 30 15:56:38 2008 @@ -2328,9 +2328,9 @@ int qcount; POOL_DEBUG(SAT_DEBUG_STATS, "installing recommended packages\n"); - if (!REGARD_RECOMMENDS_OF_INSTALLED_ITEMS) + if (!solv->dosplitprovides && !REGARD_RECOMMENDS_OF_INSTALLED_ITEMS) { - for (i = 0; i < solv->decisionq.count; i++) + for (i = 1; i < solv->decisionq.count; i++) { p = solv->decisionq.elements[i]; if (p > 0 && pool->solvables[p].repo == solv->installed) @@ -2380,9 +2380,9 @@ queue_pushunique(&dq, i); } } - if (!REGARD_RECOMMENDS_OF_INSTALLED_ITEMS) + if (!solv->dosplitprovides && !REGARD_RECOMMENDS_OF_INSTALLED_ITEMS) { - for (i = 0; i < solv->decisionq.count; i++) + for (i = 1; i < solv->decisionq.count; i++) { p = solv->decisionq.elements[i]; if (p > 0 && pool->solvables[p].repo == solv->installed) Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomat… ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Wed Jan 30 15:56:38 2008 @@ -174,6 +174,9 @@ Repo *system; // system repo Repo *locales; // where we store locales + Id *languages; + int nlanguages; + Id arch; // set architecture int fixsystem; /* 0/1, if fix system (?) */ @@ -182,6 +185,7 @@ int allowuninstall; /* 0/1, if solver should remove installed package for solution */ int allowvirtualconflicts; /* 0/1, if conflicts specify package names or package provides */ int allowarchchange; /* 0/1, if packages can change architecture */ + int dosplitprovides; /* 0/1, if splitprovides should be looked at */ struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; @@ -271,6 +275,13 @@ char dir[PATH_MAX]; int i; + if (name == NAMESPACE_LANGUAGE && !ISRELDEP(evr)) + { + for (i = 0; i < pd->nlanguages; i++) + if (evr == pd->languages[i]) + return 1; + return 0; + } if (name != NAMESPACE_MODALIAS || ISRELDEP(evr)) return 0; if (pd->nmodaliases == -1) @@ -648,6 +659,7 @@ } +#if 0 static void insertLocale( Parsedata *pd, const char *name) { Pool *pool = pd->pool; @@ -686,6 +698,24 @@ queue_push( &(pd->trials), s - pool->solvables ); } +#else + +static void insertLocale(Parsedata *pd, const char *name) +{ + int i; + Id id; + + id = str2id(pd->pool, name, 1); + for (i = 0; i < pd->nlanguages; i++) + if (pd->languages[i] == id) + return; + pd->languages = realloc(pd->languages, (pd->nlanguages + 1) * sizeof(Id)); + pd->languages[pd->nlanguages++] = id; +} + +#endif + + /*----------------------------------------------------------------*/ /* @@ -1134,6 +1164,7 @@ //pd->fixsystem = 1; pd->allowuninstall = 1; pd->allowdowngrade = 1; + pd->dosplitprovides = 1; break; case STATE_UPGRADE: { @@ -1212,6 +1243,7 @@ solv->allowdowngrade = pd->allowdowngrade; solv->allowuninstall = pd->allowuninstall; solv->allowarchchange = pd->allowarchchange; + solv->dosplitprovides = pd->dosplitprovides; solv->noupdateprovide = 1; // Solve ! -- 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] r8412 - /branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc
by schubi2＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: schubi2 Date: Wed Jan 30 14:36:20 2008 New Revision: 8412 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8412&view=rev Log: removed setdirty Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/SATResolver.cc Wed Jan 30 14:36:20 2008 @@ -434,7 +434,6 @@ } _solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() ); - sat::Pool::instance().setDirty(); sat::Pool::instance().prepare(); // Solve ! -- 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] r8411 - /trunk/sat-solver/tools/repo_write.c
by mlschroe＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: mlschroe Date: Wed Jan 30 13:05:35 2008 New Revision: 8411 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8411&view=rev Log: - add optimization comment Modified: trunk/sat-solver/tools/repo_write.c Modified: trunk/sat-solver/tools/repo_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_write.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_write.c (original) +++ trunk/sat-solver/tools/repo_write.c Wed Jan 30 13:05:35 2008 @@ -644,6 +644,7 @@ } if (cbdata->mykeys[rm].storage == KEY_STORAGE_VERTICAL_OFFSET && kv->eof) { + /* we can re-use old data in the blob here! */ data_addid(cbdata->extdata + 0, cbdata->vstart); /* add offset into incore data */ data_addid(cbdata->extdata + 0, xd->len - cbdata->vstart); /* add length into incore data */ cbdata->vstart = 0; -- 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] r8410 - /trunk/sat-solver/src/repo_solv.c
by mlschroe＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: mlschroe Date: Wed Jan 30 12:17:31 2008 New Revision: 8410 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8410&view=rev Log: allow empty strings Modified: trunk/sat-solver/src/repo_solv.c Modified: trunk/sat-solver/src/repo_solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo_solv.c?rev=8… ============================================================================== --- trunk/sat-solver/src/repo_solv.c (original) +++ trunk/sat-solver/src/repo_solv.c Wed Jan 30 12:17:31 2008 @@ -662,7 +662,7 @@ if ((solvflags & SOLV_FLAG_PREFIX_POOL) == 0) { - if (fread(strsp, sizeid, 1, fp) != 1) + if (sizeid && fread(strsp, sizeid, 1, fp) != 1) { pool_debug(pool, SAT_ERROR, "read error while reading strings\n"); return SOLV_ERROR_EOF; @@ -675,7 +675,7 @@ char *pp = prefix; char *old_str = 0; char *dest = strsp; - if (fread(prefix, pfsize, 1, fp) != 1) + if (pfsize && fread(prefix, pfsize, 1, fp) != 1) { pool_debug(pool, SAT_ERROR, "read error while reading strings\n"); sat_free(prefix); -- 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] r8409 - /trunk/sat-solver/tools/repo_write.c
by mlschroe＠svn.opensuse.org 30 Jan '08

30 Jan '08

Author: mlschroe Date: Wed Jan 30 12:17:07 2008 New Revision: 8409 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8409&view=rev Log: - allow empty string space Modified: trunk/sat-solver/tools/repo_write.c Modified: trunk/sat-solver/tools/repo_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_write.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_write.c (original) +++ trunk/sat-solver/tools/repo_write.c Wed Jan 30 12:17:07 2008 @@ -138,7 +138,7 @@ putc(x >> 8, fp) == EOF || putc(x, fp) == EOF) { - perror("write error"); + perror("write error u32"); exit(1); } } @@ -153,7 +153,7 @@ { if (putc(x, fp) == EOF) { - perror("write error"); + perror("write error u8"); exit(1); } } @@ -167,7 +167,7 @@ { if (fwrite(data, len, 1, fp) != 1) { - perror("write error"); + perror("write error blob"); exit(1); } } @@ -191,7 +191,7 @@ putc((x >> 7) | 128, fp); if (putc(x & 127, fp) == EOF) { - perror("write error"); + perror("write error id"); exit(1); } } @@ -1258,10 +1258,13 @@ */ write_u32(fp, sizeid); write_u32(fp, pp - prefix); - if (fwrite(prefix, pp - prefix, 1, fp) != 1) + if (pp != prefix) { - perror("write error"); - exit(1); + if (fwrite(prefix, pp - prefix, 1, fp) != 1) + { + perror("write error prefix"); + exit(1); + } } sat_free(prefix); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0