September 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7216 - in /trunk/libzypp/zypp: DiskUsage.cc DiskUsage.h
by mlandres＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: mlandres Date: Wed Sep 12 17:24:20 2007 New Revision: 7216 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7216&view=rev Log: - Assert assert leading and trailing '/' on pathnames in ctor. - Remove empty dummy operator= causing data loss Modified: trunk/libzypp/zypp/DiskUsage.cc trunk/libzypp/zypp/DiskUsage.h Modified: trunk/libzypp/zypp/DiskUsage.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsage.cc?rev=72… ============================================================================== --- trunk/libzypp/zypp/DiskUsage.cc (original) +++ trunk/libzypp/zypp/DiskUsage.cc Wed Sep 12 17:24:20 2007 @@ -29,8 +29,8 @@ iterator fst = begin(); for ( ; fst != end() && !fst->isBelow( ret ); ++fst ) ; // seek 1st equal or below - - bool found = false; + + bool found = false; if ( fst != end() ) { iterator lst = fst; found = true; @@ -50,7 +50,7 @@ { dname.insert(dname.begin(), '/'); } - + Entry tmp( dname ); tmp._size = ret._size; @@ -73,7 +73,7 @@ } } } - + return ret; } Modified: trunk/libzypp/zypp/DiskUsage.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsage.h?rev=721… ============================================================================== --- trunk/libzypp/zypp/DiskUsage.h (original) +++ trunk/libzypp/zypp/DiskUsage.h Wed Sep 12 17:24:20 2007 @@ -22,7 +22,7 @@ class DiskUsage { public: /** - * @short Holds data about how much space will be needed per directory + * @short Holds data about how much space will be needed per directory. **/ struct Entry { Entry() : _size(0), _files(0) {}; @@ -30,8 +30,15 @@ const unsigned size_r = 0, const unsigned files_r = 0) : path(path_r), _size(size_r), _files(files_r) - {} - const std::string path; + { + // assert leading and trailing '/' + if ( ! path.empty() ) + { + if ( *path.begin() != '/' ) path.insert( path.begin(), '/' ); + if ( *path.rbegin() != '/' ) path.insert( path.end(), '/' ); + } + } + std::string path; mutable unsigned _size; mutable unsigned _files; friend std::ostream & operator<<( std::ostream & str, const Entry & obj ); @@ -62,12 +69,6 @@ } /** - * - **/ - const Entry & operator=( const Entry & rhs ) const { - return rhs; - } - /** * Numerical operation based on size and files values. **/ const Entry & operator+=( const Entry & rhs ) 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] r7215 - /trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc
by mlandres＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: mlandres Date: Wed Sep 12 17:20:11 2007 New Revision: 7215 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7215&view=rev Log: remove obsolete logline Modified: trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc Modified: trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmPacka… ============================================================================== --- trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc (original) +++ trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc Wed Sep 12 17:20:11 2007 @@ -56,7 +56,6 @@ // we know we are reading english. _description.setText(data->tag_description(), Locale("en")); data->tag_du(_disk_usage); - SEC << _disk_usage << endl; _location.setDownloadSize(data->tag_archivesize()); } -- 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] r7214 - in /trunk/libzypp/zypp/repo/cached: PackageImpl.cc SrcPackageImpl.cc
by mlandres＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: mlandres Date: Wed Sep 12 17:17:53 2007 New Revision: 7214 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7214&view=rev Log: Fix du entries. Need to store all parent entries as well. Modified: trunk/libzypp/zypp/repo/cached/PackageImpl.cc trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc Modified: trunk/libzypp/zypp/repo/cached/PackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/Package… ============================================================================== --- trunk/libzypp/zypp/repo/cached/PackageImpl.cc (original) +++ trunk/libzypp/zypp/repo/cached/PackageImpl.cc Wed Sep 12 17:17:53 2007 @@ -201,13 +201,15 @@ { // No info: Creating a faked entry distributing the // total package size in assumed 200 files to "/ZYPP_NO_DU_INFO" - // The reported size is in kB. + // The reported size are 1K blocks. // // Note: Less likely that some system has a mountpoint named // ZYPP_NO_DU_INFO, so the size will be accounted to '/'. // but adding a faked mountpoint entry an application is able // to spot and handle these faked data in a different manner. - _diskusage->add( "/ZYPP_NO_DU_INFO", size() / 1024, 200 ); + unsigned dusize = size().blocks( ByteCount::K ); + _diskusage->add( "/", dusize, 200 ); + _diskusage->add( "/ZYPP_NO_DU_INFO/", dusize, 200 ); } } return *_diskusage; Modified: trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/SrcPack… ============================================================================== --- trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc (original) +++ trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc Wed Sep 12 17:17:53 2007 @@ -122,8 +122,12 @@ { // No info: Creating a faked entry distributing the // total source package size in assumed 20 files to "/usr/src/packages" - // The reported size is in kB - _diskusage->add( "/usr/src/packages", size() / 1024, 20 ); + // The reported size are 1K blocks. + unsigned dusize = size().blocks( ByteCount::K ); + _diskusage->add( "/", dusize, 20 ); + _diskusage->add( "/usr/", dusize, 20 ); + _diskusage->add( "/usr/src/", dusize, 20 ); + _diskusage->add( "/usr/src/packages/", dusize, 20 ); } } return *_diskusage; -- 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] r7213 - /trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc
by mlandres＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: mlandres Date: Wed Sep 12 17:15:55 2007 New Revision: 7213 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7213&view=rev Log: Store DU entries, if they are equal to or parent of a mountpoint. If no mountpoints are available limit DU entries to depth 3. Modified: trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc Modified: trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/Pac… ============================================================================== --- trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc (original) +++ trunk/libzypp/zypp/parser/susetags/PackagesDuFileReader.cc Wed Sep 12 17:15:55 2007 @@ -13,6 +13,7 @@ #include "zypp/base/Easy.h" #include "zypp/base/Regex.h" #include "zypp/base/Logger.h" +#include "zypp/base/String.h" #include "zypp/ZYppFactory.h" #include "zypp/parser/susetags/PackagesDuFileReader.h" @@ -42,25 +43,20 @@ public: Impl( const PackagesDuFileReader & parent_r ) : BaseImpl( parent_r ) - , _counted_entries(0) - , _discarded_entries(0) { _mounts = getZYpp()->getPartitions(); - + for ( DiskUsageCounter::MountPointSet::const_iterator it = _mounts.begin(); it != _mounts.end(); ++ it ) { MIL << "Partition " << *it << endl; } - + } virtual ~Impl() - { - MIL << "DiskUsage: consumed:[ " << _counted_entries - << " ] discarded:[ " << _discarded_entries << " ]" << endl; - } + {} bool hasPackage() const { return _pkgData; } @@ -133,58 +129,52 @@ if ( str::regex_match( *it, what, sizeEntryRX ) ) { bool skip = true; - - // add slash if it's missing - std::string dd(what[1]); - if (dd.size() > 1 && dd[0] != '/') - { - dd.insert(dd.begin(), '/'); - } - - DiskUsage::Entry entry(dd, - str::strtonum<unsigned>(what[2]) + str::strtonum<unsigned>(what[3]), - str::strtonum<unsigned>(what[4]) + str::strtonum<unsigned>(what[5]) ); - + DiskUsage::Entry entry( what[1], + str::strtonum<unsigned>(what[2]) + str::strtonum<unsigned>(what[3]), + str::strtonum<unsigned>(what[4]) + str::strtonum<unsigned>(what[5]) ); + if ( _mounts.empty() ) { - // if no mount information, parse it all - // FIXME at least detect levels? - skip = false; + // if no mount information, cut off deeper directory + // levels in DiskUsage::Entry to reduce data size. + unsigned level = 3; // number of '/' incl. a trailing one + std::string::size_type pos = 0; // we store absolute pathnames + while ( --level && pos != std::string::npos ) + { + pos = entry.path.find( "/", pos+1 ); + } + if ( pos != std::string::npos ) + { + // found 'level' number of '/'es. + skip = ( entry.path[pos] != '\0' ); + } + else + { + // less than 'level' number of '/'es. + skip = false; + } } else { - // iterate over important mounts in reverse order, from the leaves to - // the root + // Store entries, if they are equal to or parent of a mountpoint. for ( DiskUsageCounter::MountPointSet::reverse_iterator mit = _mounts.rbegin(); - mit != _mounts.rend(); - ++ mit ) + mit != _mounts.rend(); + ++ mit ) { - // if the directory we are adding is below one of the mount points - // just add the mount point so it gets summed. - //MIL << "is '" << entry.path << "' == '" << (*mit).dir << "' ?" << endl; - // FIXME make this more clear - if ( entry.path == ( ((*mit).dir[(*mit).dir.size()-1] == '/') ? (*mit).dir : ((*mit).dir + '/' ) ) ) + // Entry.path has leading and trailing '/' (asserted by DiskUsage::Entry). + // So we append a '/' to the mountpoint and test for prefix_r. + if ( str::hasPrefix( (mit->dir+"/"), entry.path ) ) { - // entry is a mountpoint, so we need to keep it - //MIL << "yes" << endl; - // just discard it - _discarded_entries++; skip = false; break; } - else - { - //MIL << "no" << endl; - } } } // try next entry if ( skip ) continue; - - //MIL << "adding entry for " << entry.path << endl; + _data->diskusage.add(entry); - _counted_entries++; } else { @@ -202,8 +192,6 @@ data::Package_Ptr _pkgData; data::SrcPackage_Ptr _srcpkgData; DiskUsageCounter::MountPointSet _mounts; - int _counted_entries; - int _discarded_entries; }; /////////////////////////////////////////////////////////////////// -- 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] r7212 - /trunk/libzypp/zypp/parser/susetags/RepoParser.cc
by mlandres＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: mlandres Date: Wed Sep 12 17:11:12 2007 New Revision: 7212 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7212&view=rev Log: avoid excessive warnings about skipped files in multiarch repos Modified: trunk/libzypp/zypp/parser/susetags/RepoParser.cc Modified: trunk/libzypp/zypp/parser/susetags/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/susetags/Rep… ============================================================================== --- trunk/libzypp/zypp/parser/susetags/RepoParser.cc (original) +++ trunk/libzypp/zypp/parser/susetags/RepoParser.cc Wed Sep 12 17:11:12 2007 @@ -214,19 +214,19 @@ */ Pathname assertMandatoryFile( const Pathname & file_r, bool lookgz = true ) const { - if ( lookgz ) - { - PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) ); - if ( !gzinputfile.isFile() ) - { - WAR << _reporoot << ": Skip gz required file (will look for non-gz): " << file_r.extend(".gz").asString() << endl; - } - else - { - return gzinputfile.path(); - } - } - PathInfo inputfile( _reporoot / file_r ); + if ( lookgz ) + { + PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) ); + if ( !gzinputfile.isFile() ) + { + WAR << _reporoot << ": Skip gz required file (will look for non-gz): " << file_r.extend(".gz").asString() << endl; + } + else + { + return gzinputfile.path(); + } + } + PathInfo inputfile( _reporoot / file_r ); if ( ! inputfile.isFile() ) { ZYPP_THROW( ParseException( _reporoot.asString() + ": " + _("Required file is missing: ") + file_r.asString() ) ); @@ -239,22 +239,22 @@ */ Pathname getOptionalFile( const Pathname & file_r, bool lookgz = true ) const { - if ( lookgz ) - { - PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) ); - if ( !gzinputfile.isFile() ) - { - WAR << _reporoot << ": Skip optional file: " << file_r.extend(".gz").asString() << endl; - } - else - { - return gzinputfile.path(); - } - } - PathInfo inputfile( _reporoot / file_r ); + if ( lookgz ) + { + PathInfo gzinputfile( _reporoot / (file_r.extend(".gz")) ); + if ( !gzinputfile.isFile() ) + { + //WAR << _reporoot << ": Skip optional file: " << file_r.extend(".gz").asString() << endl; + } + else + { + return gzinputfile.path(); + } + } + PathInfo inputfile( _reporoot / file_r ); if ( ! inputfile.isFile() ) { - WAR << _reporoot << ": Skip optional file: " << file_r.asString() << endl; + //WAR << _reporoot << ": Skip optional file: " << file_r.asString() << endl; return Pathname(); } return inputfile.path(); @@ -287,19 +287,19 @@ return true; // got it } - if ( it->first == (searchFor+".gz") ) - { - // got it - PathInfo inputfile( _reporoot / _descrdir / (searchFor+".gz") ); - if ( ! inputfile.isFile() ) - { - WAR << "Known and desired file is not on disk: " << inputfile << endl; - } - else - return true; // got it - } - } - return false; // not found + if ( it->first == (searchFor+".gz") ) + { + // got it + PathInfo inputfile( _reporoot / _descrdir / (searchFor+".gz") ); + if ( ! inputfile.isFile() ) + { + WAR << "Known and desired file is not on disk: " << inputfile << endl; + } + else + return true; // got it + } + } + return false; // not found } /** Take care translations for \a locale_r or an appropriate @@ -361,7 +361,7 @@ data::RecordId ret = _idMap[key_r]; if ( ret == data::noRecordId ) { - WAR << "No record id for " << key_r << endl; + //WAR << "No record id for " << key_r << endl; } return ret; } -- 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] r7211 - /trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution
by schubi2＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: schubi2 Date: Wed Sep 12 16:11:35 2007 New Revision: 7211 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7211&view=rev Log: update Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution Wed Sep 12 16:11:35 2007 @@ -9196,6 +9196,5 @@ >!> upgrade zvbi-0.2.16-81.i586 => zvbi-0.2.16-89.i586[1] >!> upgrade zypper-0.8.10-2.i586 => zypper-0.8.19-2.i586[1] >!> |unflag cracklib-dict-full-2.8.10-28.i586[1] ->!> |unflag pattern:sw_management_gnome-10.3-133.i586[1] >!> |unflag sendmail-8.14.1-46.i586[1] >!> installs=113, upgrades=677, uninstalls=4 -- 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] r7210 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: schubi2 Date: Wed Sep 12 15:49:27 2007 New Revision: 7210 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7210&view=rev Log: Regarding keep state while recycle old valid solver results. Bug 286889 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 Wed Sep 12 15:49:27 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 12 15:48:41 CEST 2007 - schubi(a)suse.de + +- Regarding keep state while recycle old valid solver results. Bug 286889 +- r 7209 + +------------------------------------------------------------------- Wed Sep 12 12:24:49 CEST 2007 - jkupec(a)suse.cz - report 100% progress on finishing RPM removal (bug #309431) -- 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] r7209 - in /trunk/libzypp/zypp: ResFilters.h solver/detail/ContextPool.cc solver/detail/ContextPool.h solver/detail/Resolver.cc solver/detail/Resolver.h solver/detail/ResolverContext.h
by schubi2＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: schubi2 Date: Wed Sep 12 15:48:13 2007 New Revision: 7209 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7209&view=rev Log: Regarding keep state while recycle old valid solver results. Bug 286889 Modified: trunk/libzypp/zypp/ResFilters.h trunk/libzypp/zypp/solver/detail/ContextPool.cc trunk/libzypp/zypp/solver/detail/ContextPool.h trunk/libzypp/zypp/solver/detail/Resolver.cc trunk/libzypp/zypp/solver/detail/Resolver.h trunk/libzypp/zypp/solver/detail/ResolverContext.h Modified: trunk/libzypp/zypp/ResFilters.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResFilters.h?rev=72… ============================================================================== --- trunk/libzypp/zypp/ResFilters.h (original) +++ trunk/libzypp/zypp/ResFilters.h Wed Sep 12 15:48:13 2007 @@ -338,6 +338,16 @@ } }; + /** Select PoolItem by keep. */ + struct ByKeep : public PoolItemFilterFunctor + { + bool operator()( const PoolItem & p ) const + { + return p.status().isKept(); + } + }; + + /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/solver/detail/ContextPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Conte… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ContextPool.cc (original) +++ trunk/libzypp/zypp/solver/detail/ContextPool.cc Wed Sep 12 15:48:13 2007 @@ -80,7 +80,8 @@ void ContextPool::addContext (ResolverContext_Ptr context, const PoolItemList & installItems, const PoolItemList & deleteItems, - const PoolItemList & lockUninstalledItems) + const PoolItemList & lockUninstalledItems, + const PoolItemList & keepItems) { if ((installItems.size() == 0 && deleteItems.size() == 0) @@ -93,7 +94,8 @@ new_context->setUserInstallItems (installItems); new_context->setUserDeleteItems (deleteItems); - new_context->setUserLockUninstalledItems (lockUninstalledItems); + new_context->setUserLockUninstalledItems (lockUninstalledItems); + new_context->setUserKeepItems (keepItems); if (contextList.size() <= 0) { contextList.push_front (new_context); @@ -156,6 +158,23 @@ } } } + + // checking keep items + left = (*it)->userKeepItems(); + right = context->userKeepItems(); + if (left.size() != right.size()) + continue; + found = true; + for (PoolItemList::iterator itleft = left.begin(); + (itleft != left.end()) && found ; ++itleft) { + found = false; + for (PoolItemList::iterator itright = right.begin(); itright != right.end(); ++itright) { + if (*itleft == *itright) { + found = true; + break; + } + } + } if (found) { exists = true; @@ -186,7 +205,9 @@ _XDEBUG(" deleted:"); dumpTaskList (new_context->userDeleteItems()); _XDEBUG(" locked:"); - dumpTaskList (new_context->userLockUninstalledItems()); + dumpTaskList (new_context->userLockUninstalledItems()); + _XDEBUG(" keep:"); + dumpTaskList (new_context->userKeepItems()); #if 0 _XDEBUG("CONTEXT : " << endl << *new_context ); #endif @@ -207,7 +228,8 @@ ResolverContext_Ptr ContextPool::findContext (PoolItemList & installItems, PoolItemList & deleteItems, - const PoolItemList & lockUninstalledItems) + const PoolItemList & lockUninstalledItems, + const PoolItemList & keepItems) { // searching for context with same entries int counter = 1; @@ -215,7 +237,8 @@ PoolItemList contextInstall = (*it)->userInstallItems(); PoolItemList contextDelete = (*it)->userDeleteItems(); - PoolItemList contextLockUninstalled = (*it)->userLockUninstalledItems(); + PoolItemList contextLockUninstalled = (*it)->userLockUninstalledItems(); + PoolItemList contextKeep = (*it)->userKeepItems(); _XDEBUG("ContextPool::findContext() trying " << counter++ << ". of " << contextList.size() ); _XDEBUG(" comparing"); @@ -225,6 +248,9 @@ dumpTaskList (contextDelete); _XDEBUG(" lockedUninstalled:"); dumpTaskList (contextLockUninstalled); + _XDEBUG(" keep:"); + dumpTaskList (contextKeep); + _XDEBUG(" with needed"); _XDEBUG(" installed:"); @@ -233,10 +259,13 @@ dumpTaskList (deleteItems); _XDEBUG(" lockedUninstalled:"); dumpTaskList (lockUninstalledItems); + _XDEBUG(" keep:"); + dumpTaskList (keepItems); if (contextInstall.size() > installItems.size() || contextDelete.size() > deleteItems.size() - || contextLockUninstalled.size() != lockUninstalledItems.size()) + || contextLockUninstalled.size() != lockUninstalledItems.size() + || contextKeep.size() != keepItems.size()) continue; // cannot fit at all bool found = true; @@ -257,6 +286,21 @@ } if (!found) continue; + // check if the keep items are the same. + // If not --> try the next context + for (PoolItemList::iterator itContext = contextKeep.begin(); + (itContext != contextKeep.end()) && found; ++itContext) { + found = false; + for (PoolItemList::const_iterator itInstall = keepItems.begin(); + itInstall != keepItems.end(); ++itInstall) { + if (*itContext == *itInstall) { + found = true; + break; + } + } + } + if (!found) continue; + // checking items which will be installed PoolItemList addInsItems = installItems; for (PoolItemList::iterator itContext = contextInstall.begin(); Modified: trunk/libzypp/zypp/solver/detail/ContextPool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Conte… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ContextPool.h (original) +++ trunk/libzypp/zypp/solver/detail/ContextPool.h Wed Sep 12 15:48:13 2007 @@ -94,12 +94,14 @@ * @param installItems List of items which are selected by the user * @param deleteItems List of items which are selected by the user * @param lockUninstalledItems List of items which are selected by the user + * @param keepItems List of items which are selected by the user * * */ void addContext (ResolverContext_Ptr context, const PoolItemList & installItems, const PoolItemList & deleteItems, - const PoolItemList & lockUninstalledItems); + const PoolItemList & lockUninstalledItems, + const PoolItemList & keepItems); /** * Find a solver result in order to use it for the next solver run. * @@ -107,11 +109,13 @@ * @param installItems List of items which are selected by the user * @param deleteItems List of items which are selected by the user * @param lockUninstalledItems List of items which are selected by the user + * @param keepItems List of items which are selected by the user * @return solver context * */ ResolverContext_Ptr findContext (PoolItemList & installItems, PoolItemList & deleteItems, - const PoolItemList & lockUninstalledItems); + const PoolItemList & lockUninstalledItems, + const PoolItemList & keepItems); /** * Delete all sucessful solver run. Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Wed Sep 12 15:48:13 2007 @@ -151,6 +151,7 @@ _items_to_remove.clear(); _items_to_verify.clear(); _items_to_establish.clear(); + _items_to_keep.clear(); if (!keepExtras) { _extra_caps.clear(); @@ -374,6 +375,12 @@ _items_to_lockUninstalled.unique (); } +void +Resolver::addPoolItemToKepp (PoolItem_Ref item) +{ + _items_to_keep.push_back (item); + _items_to_keep.unique (); +} void Resolver::addPoolItemToEstablish (PoolItem_Ref item) @@ -1221,6 +1228,12 @@ resolver.addPoolItemToLockUninstalled (item); } + if (status.isKept() + && !by_solver) { + // collecting all keep states + resolver.addPoolItemToKepp (item); + } + return true; } }; @@ -1237,9 +1250,11 @@ if (!full_pool_shown // show item if not shown all before || it->status().transacts() // or transacts + || it->status().isKept() + || it->status().isLocked() || !it->status().isUndetermined()) // or established status { - _DEBUG( count << ": " << *it ); + _XDEBUG( count << ": " << *it ); } } _XDEBUG( "---------------------------------------" ); @@ -1312,13 +1327,19 @@ invokeOnEach ( _pool.begin(), _pool.end(), resfilter::ByLock( ), // collect locks from Pool to resolver queue functor::functorRef<bool,PoolItem>(info) ); + + invokeOnEach ( _pool.begin(), _pool.end(), + resfilter::ByKeep( ), // collect keeps from Pool to resolver queue + functor::functorRef<bool,PoolItem>(info) ); + // List of installing/removing items of the complete run (not regarding a recycled solver run) PoolItemList _completeItems_to_install = _items_to_install; PoolItemList _completeItems_to_remove = _items_to_remove; PoolItemList _completeItems_to_lockUninstalled = _items_to_lockUninstalled; + PoolItemList _completeItems_to_keep = _items_to_keep; // We have to find a valid context in order to recycle it. - saveContext = contextPool.findContext (_items_to_install, _items_to_remove, _items_to_lockUninstalled); + saveContext = contextPool.findContext (_items_to_install, _items_to_remove, _items_to_lockUninstalled, _items_to_keep); // _items_to_install, _items_to_remove contains addition items which has been selected but are // not solved with that context. They will be solved now. // If we have not found any former fitting context, saveContext is NULL. So the solver @@ -1342,7 +1363,9 @@ show_pool( _pool ); #endif // insert best_context in ContextPool for further solver runs - contextPool.addContext( solution,_completeItems_to_install, _completeItems_to_remove, _completeItems_to_lockUninstalled); + contextPool.addContext( solution,_completeItems_to_install, _completeItems_to_remove, + _completeItems_to_lockUninstalled, + _completeItems_to_keep); } else { Modified: trunk/libzypp/zypp/solver/detail/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.h (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.h Wed Sep 12 15:48:13 2007 @@ -110,6 +110,7 @@ PoolItemList _items_to_remove; PoolItemList _items_to_verify; PoolItemList _items_to_lockUninstalled; + PoolItemList _items_to_keep; // pool of valid contexts which are "recycled" in order to fasten the solver ContextPool contextPool; @@ -216,6 +217,7 @@ void addPoolItemsToInstallFromList (PoolItemList & rl); void addPoolItemToLockUninstalled (PoolItem_Ref item); + void addPoolItemToKepp (PoolItem_Ref item); void addPoolItemToRemove (PoolItem_Ref item); void addPoolItemsToRemoveFromList (PoolItemList & rl); Modified: trunk/libzypp/zypp/solver/detail/ResolverContext.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/ResolverContext.h (original) +++ trunk/libzypp/zypp/solver/detail/ResolverContext.h Wed Sep 12 15:48:13 2007 @@ -108,6 +108,7 @@ PoolItemList _userDeleteItems; PoolItemList _userInstallItems; PoolItemList _userLockUninstalledItems; + PoolItemList _userKeepItems; bool _forceResolve; // remove items which are conflicts with others or // have unfulfilled requirements. @@ -199,9 +200,11 @@ void setUserDeleteItems ( const PoolItemList & deleteItems) { _userDeleteItems = deleteItems; } void setUserInstallItems ( const PoolItemList& installItems) { _userInstallItems = installItems; } void setUserLockUninstalledItems ( const PoolItemList& lockItems) { _userLockUninstalledItems = lockItems; } + void setUserKeepItems ( const PoolItemList& keepItems) { _userKeepItems = keepItems; } PoolItemList userDeleteItems () { return _userDeleteItems; } PoolItemList userInstallItems () { return _userInstallItems; } PoolItemList userLockUninstalledItems () { return _userLockUninstalledItems; } + PoolItemList userKeepItems () { return _userKeepItems; } // ---------------------------------- methods -- 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] r7208 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: jkupec Date: Wed Sep 12 14:24:54 2007 New Revision: 7208 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7208&view=rev Log: changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Wed Sep 12 14:24:54 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Sep 12 14:23:41 CEST 2007 - jkupec(a)suse.cz + +- display localized resolvable kind in various texts + +------------------------------------------------------------------- Wed Sep 12 11:40:35 CEST 2007 - jkupec(a)suse.cz - displaying the file download progress during commit phase -- 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] r7207 - in /trunk/zypper/src: zypper-info.cc zypper-misc.cc zypper-search.h zypper-source-callbacks.h zypper-utils.cc zypper-utils.h
by jkupec＠svn.opensuse.org 12 Sep '07

12 Sep '07

Author: jkupec Date: Wed Sep 12 14:17:19 2007 New Revision: 7207 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7207&view=rev Log: - display localized resolvable kind Modified: trunk/zypper/src/zypper-info.cc trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-search.h trunk/zypper/src/zypper-source-callbacks.h trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper-utils.h Modified: trunk/zypper/src/zypper-info.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-info.cc?rev=72… ============================================================================== --- trunk/zypper/src/zypper-info.cc (original) +++ trunk/zypper/src/zypper-info.cc Wed Sep 12 14:17:19 2007 @@ -9,6 +9,7 @@ #include <zypp/Patch.h> #include "zypper.h" +#include "zypper-utils.h" #include "zypper-misc.h" using namespace std; @@ -49,13 +50,15 @@ if (!installer.item) { // TranslatorExplanation E.g. "package zypper not found." - cout << "\n" << format(_("%s %s not found.")) % kind.asString() % *nameit + cout << "\n" << format(_("%s %s not found.")) + % kind_to_string_localized(kind, 1) % *nameit << endl; } else { // print info // TranslatorExplanation E.g. "Information for package zypper:" - cout << endl << format(_("Information for %s %s:")) % kind.asString() % *nameit; + cout << endl << format(_("Information for %s %s:")) + % kind_to_string_localized(kind, 1) % *nameit; cout << endl << endl; Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=72… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Wed Sep 12 14:17:19 2007 @@ -20,6 +20,7 @@ #include <zypp/target/store/xml_escape_parser.hpp> #include "zypper.h" +#include "zypper-utils.h" #include "zypper-getopt.h" #include "zypper-misc.h" #include "zypper-callbacks.h" @@ -77,35 +78,6 @@ return empty; } -string kind_to_string_localized(const KindOf<Resolvable> & kind, unsigned long count) -{ - if (kind == ResTraits<Package>::kind.asString()) - return _PL("package", "packages", count); - if (kind == ResTraits<Selection>::kind.asString()) - return _PL("selection", "selections", count); - if (kind == ResTraits<Pattern>::kind.asString()) - return _PL("pattern", "patterns", count); - if (kind == ResTraits<Product>::kind.asString()) - return _PL("product", "product", count); - if (kind == ResTraits<Patch>::kind.asString()) - return _PL("patch", "patches", count); - if (kind == ResTraits<Script>::kind.asString()) - return _PL("script", "scripts", count); - if (kind == ResTraits<Message>::kind.asString()) - return _PL("message", "messages", count); - if (kind == ResTraits<Language>::kind.asString()) - return _PL("language", "languages", count); - if (kind == ResTraits<Atom>::kind.asString()) - return _PL("atom", "atoms", count); - if (kind == ResTraits<SystemResObject>::kind.asString()) - return _PL("system", "systems", count); - if (kind == ResTraits<SrcPackage>::kind.asString()) - return _PL("srcpackage", "srcpackages", count); - // default - return _PL("resolvable", "resolvables", count); -} - - // copied from yast2-pkg-bindings:PkgModuleFunctions::DoProvideNameKind bool ProvideProcess::operator()( const PoolItem& provider ) { @@ -292,7 +264,7 @@ cout_vv << "... done" << endl; if (!installer.item) { // TranslatorExplanation e.g. "package 'pornview' not found" - cerr << format(_("%s '%s' not found")) % kind % name << endl; + cerr << format(_("%s '%s' not found")) % kind_to_string_localized(kind,1) % name << endl; WAR << format("%s '%s' not found") % kind % name << endl; return; @@ -301,7 +273,7 @@ if (installer.installed_item && installer.installed_item.resolvable()->edition() == installer.item.resolvable()->edition() && installer.installed_item.resolvable()->arch() == installer.item.resolvable()->arch()) { - cout_n << format(_("skipping %s '%s' (already installed)")) % kind.asString() % name << endl; + cout_n << format(_("skipping %s '%s' (already installed)")) % kind_to_string_localized(kind,1) % name << endl; } else { // TODO don't use setToBeInstalled for this purpose but higher level solver API @@ -353,7 +325,8 @@ ); cerr_vv << "... done" << endl; if (!deleter.found) { - cerr << _("Not found") << endl; + // TranslatorExplanation e.g. "package 'pornview' not found" + cerr << format(_("%s '%s' not found")) % kind_to_string_localized(kind,1) % name << endl; return; //error? } } @@ -1489,7 +1462,8 @@ // TranslatorExplanation The first %s is name of the resolvable, the second is its kind (e.g. 'zypper package') if (!gSettings.machine_readable) cout << format(_("Automatically agreeing with %s %s license.")) - % it->resolvable()->name() % it->resolvable()->kind().asString() + % it->resolvable()->name() + % kind_to_string_localized(it->resolvable()->kind(),1) << endl; MIL << format("Automatically agreeing with %s %s license.") @@ -1499,8 +1473,8 @@ continue; } - cout << format(_("%s %s license:")) - % it->resolvable()->name() % it->resolvable()->kind().asString() + cout << format(_("%s %s license:")) % it->resolvable()->name() + % kind_to_string_localized(it->resolvable()->kind(), 1) << it->resolvable()->licenseToConfirm() << endl; string question = _("In order to install this package, you must agree" @@ -1530,7 +1504,8 @@ // TranslatorExplanation e.g. "... with flash package license." cout << format( _("Aborting installation due to user disagreement with %s %s license.")) - % it->resolvable()->name() % it->resolvable()->kind().asString() + % it->resolvable()->name() + % kind_to_string_localized(it->resolvable()->kind(), 1) << endl; MIL << "License(s) NOT confirmed (interactive)" << endl; } Modified: trunk/zypper/src/zypper-search.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.h?rev=7… ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/zypper-search.h Wed Sep 12 14:17:19 2007 @@ -21,6 +21,7 @@ #include <zypp/RepoManager.h> #include "zypper.h" +#include "zypper-utils.h" #include "zypper-getopt.h" #include "zypper-tabulator.h" @@ -316,7 +317,8 @@ row << "i" << pool_item.resolvable()->repository().info().name() // TODO what about rug's Bundle? - << (gSettings.is_rug_compatible ? "" : pool_item.resolvable()->kind().asString()) + << (gSettings.is_rug_compatible ? + "" : kind_to_string_localized(pool_item.resolvable()->kind(), 1)) << pool_item.resolvable()->name() << pool_item.resolvable()->edition().asString() << pool_item.resolvable()->arch().asString(); @@ -357,7 +359,8 @@ // add other fields to the result table row << alias // TODO what about rug's Bundle? - << (gSettings.is_rug_compatible ? "" : res->kind.asString()) + << (gSettings.is_rug_compatible ? + "" : kind_to_string_localized(res->kind, 1)) << res->name << res->edition.asString() << res->arch.asString(); Modified: trunk/zypper/src/zypper-source-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-source-callbac… ============================================================================== --- trunk/zypper/src/zypper-source-callbacks.h (original) +++ trunk/zypper/src/zypper-source-callbacks.h Wed Sep 12 14:17:19 2007 @@ -25,7 +25,7 @@ #include "zypper.h" #include "zypper-callbacks.h" - +#include "zypper-utils.h" /////////////////////////////////////////////////////////////////// namespace ZmartRecipients @@ -177,7 +177,8 @@ _url = url; cout_n << boost::format(_("Downloading %s %s-%s.%s")) - % _resolvable_ptr->kind() % _resolvable_ptr->name() + % kind_to_string_localized(_resolvable_ptr->kind(), 1) + % _resolvable_ptr->name() % _resolvable_ptr->edition() % _resolvable_ptr->arch(); // grr, bad class?? Modified: trunk/zypper/src/zypper-utils.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.cc?rev=7… ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/zypper-utils.cc Wed Sep 12 14:17:19 2007 @@ -57,3 +57,33 @@ mm.close(id); return is_cd; } + +// ---------------------------------------------------------------------------- + +string kind_to_string_localized(const KindOf<Resolvable> & kind, unsigned long count) +{ + if (kind == ResTraits<Package>::kind.asString()) + return _PL("package", "packages", count); + if (kind == ResTraits<Selection>::kind.asString()) + return _PL("selection", "selections", count); + if (kind == ResTraits<Pattern>::kind.asString()) + return _PL("pattern", "patterns", count); + if (kind == ResTraits<Product>::kind.asString()) + return _PL("product", "product", count); + if (kind == ResTraits<Patch>::kind.asString()) + return _PL("patch", "patches", count); + if (kind == ResTraits<Script>::kind.asString()) + return _PL("script", "scripts", count); + if (kind == ResTraits<Message>::kind.asString()) + return _PL("message", "messages", count); + if (kind == ResTraits<Language>::kind.asString()) + return _PL("language", "languages", count); + if (kind == ResTraits<Atom>::kind.asString()) + return _PL("atom", "atoms", count); + if (kind == ResTraits<SystemResObject>::kind.asString()) + return _PL("system", "systems", count); + if (kind == ResTraits<SrcPackage>::kind.asString()) + return _PL("srcpackage", "srcpackages", count); + // default + return _PL("resolvable", "resolvables", count); +} Modified: trunk/zypper/src/zypper-utils.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.h?rev=72… ============================================================================== --- trunk/zypper/src/zypper-utils.h (original) +++ trunk/zypper/src/zypper-utils.h Wed Sep 12 14:17:19 2007 @@ -6,6 +6,7 @@ #include <zypp/Pathname.h> #include <zypp/Url.h> +#include <zypp/Resolvable.h> std::string read_line_from_file( const zypp::Pathname &file ); void write_line_to_file( const zypp::Pathname &file, const std::string &line ); @@ -17,4 +18,7 @@ bool is_changeable_media(const zypp::Url & url); +std::string kind_to_string_localized( + const zypp::KindOf<zypp::Resolvable> & kind, unsigned long count); + #endif /*ZYPPER_UTILS_H*/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0