May 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r9944 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 05 May '08

05 May '08

Author: schubi2 Date: Mon May 5 09:56:10 2008 New Revision: 9944 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9944&view=rev Log: rev 9943 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 May 5 09:56:10 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon May 5 09:55:29 CEST 2008 - schubi(a)suse.de + +- Switch off the upgrade mode of the + SAT solver cause the packages have already been evaluated by + the distupgrade machanism of libzypp. (bnc #386375) +- rev 9943 + +------------------------------------------------------------------- Fri May 2 16:36:04 CEST 2008 - jreidinger(a)suse.cz - release file after copy to cache as soon as possible. -- 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] r9943 - /trunk/libzypp/zypp/solver/detail/Resolver.cc
by schubi2＠svn.opensuse.org 05 May '08

05 May '08

Author: schubi2 Date: Mon May 5 09:55:20 2008 New Revision: 9943 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9943&view=rev Log: Switch off the upgrade mode of the SAT solver cause the packages have already been evaluated by the distupgrade machanism of libzypp. (bnc #386375) Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc 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 Mon May 5 09:55:20 2008 @@ -233,7 +233,7 @@ if (_upgradeMode) { _satResolver->setAllowdowngrade(true); - _satResolver->setUpdatesystem(true); + _satResolver->setUpdatesystem(false); // not needed cause packages has already been evaluteted by distupgrade _satResolver->setDosplitprovides(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] r9942 - /trunk/sat-solver/tools/repo_content.c
by matz＠svn.opensuse.org 02 May '08

02 May '08

Author: matz Date: Fri May 2 17:18:54 2008 New Revision: 9942 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9942&view=rev Log: Parse also DISTPRODUCT and DISTVERSION (for registration), and the other (often unused) attributes of products. 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 May 2 17:18:54 2008 @@ -150,6 +150,22 @@ return olddeps; } +static void +add_multiple_strings(Repodata *data, Id handle, Id name, char *value) +{ + char *sp[2]; + while (value) + { + int words = split(value, sp, 2); + if (!words) + break; + repodata_add_poolstr_array(data, handle, name, sp[0]); + if (words == 1) + break; + value = sp[1]; + } +} + void repo_add_content(Repo *repo, FILE *fp) { @@ -158,11 +174,19 @@ int aline; Solvable *s, *firsts = 0; struct parsedata pd; + Repodata *data; + Id handle = 0; memset(&pd, 0, sizeof(pd)); line = sat_malloc(1024); aline = 1024; + if (repo->nrepodata) + /* use last repodata */ + data = repo->repodata + repo->nrepodata - 1; + else + data = repo_add_repodata(repo, 0); + pd.repo = repo; linep = line; s = 0; @@ -211,6 +235,8 @@ s->supplements = repo_fix_legacy(repo, s->provides, s->supplements); /* Only support one product. */ s = pool_id2solvable(pool, repo_add_solvable(repo)); + repodata_extend(data, s - pool->solvables); + handle = repodata_get_handle(data, s - pool->solvables - repo->start); } firsts = 0; s->name = str2id(pool, join(&pd, "product", ":", value), 1); @@ -220,14 +246,20 @@ /* Sometimes PRODUCT is not the first entry, but we need a solvable from here on. */ if (!s) - firsts = s = pool_id2solvable(pool, repo_add_solvable(repo)); + { + firsts = s = pool_id2solvable(pool, repo_add_solvable(repo)); + 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); else if (istag ("DISTPRODUCT")) - ; /* DISTPRODUCT is only for Yast, not the package manager */ + /* DISTPRODUCT is for registration and Yast, not for the solver. */ + repo_set_str(repo, s - pool->solvables, str2id(pool, "product:distproduct", 1), value); else if (istag ("DISTVERSION")) - ; /* DISTVERSION is only for Yast, not the package manager */ + /* DISTVERSION is for registration and Yast, not for the solver. */ + repo_set_str(repo, s - pool->solvables, str2id(pool, "product:distversion", 1), value); else if (istag ("VENDOR")) s->vendor = str2id(pool, value, 1); else if (istag ("ARCH")) @@ -256,6 +288,25 @@ else if (istag ("DATADIR")) repo_set_str(repo, s - pool->solvables, str2id(pool, "susetags:datadir", 1), value); /* FRESHENS doesn't seem to exist. */ + else if (istag ("TYPE")) + repo_set_str(repo, s - pool->solvables, str2id(pool, "product:type", 1), value); + else if (istag ("RELNOTESURL")) + repodata_add_poolstr_array(data, handle, str2id(pool, "product:relnotesurl", 1), value); + else if (istag ("UPDATEURLS")) + add_multiple_strings(data, handle, str2id(pool, "product:updateurls", 1), value); + else if (istag ("EXTRAURLS")) + add_multiple_strings(data, handle, str2id(pool, "product:extraurls", 1), value); + else if (istag ("OPTIONALURLS")) + add_multiple_strings(data, handle, str2id(pool, "product:optionalurls", 1), value); + else if (istag ("SHORTLABEL")) + repo_set_str(repo, s - pool->solvables, str2id(pool, "product:shortlabel", 1), value); + else if (istag ("LABEL")) + repo_set_str(repo, s - pool->solvables, str2id(pool, "product:label", 1), value); + else if (!strncmp (key, "LABEL.", 6)) + repo_set_str(repo, s - pool->solvables, str2id(pool, join(&pd, "product:label:", key + 6, 0), 1), value); + else if (istag ("FLAGS")) + add_multiple_strings(data, handle, str2id(pool, "product:flags", 1), value); + /* XXX do something about LINGUAS and ARCH? */ #undef istag } -- 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] r9941 - /trunk/libzypp/package/libzypp.changes
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 16:32:43 2008 New Revision: 9941 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9941&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 Fri May 2 16:32:43 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri May 2 16:36:04 CEST 2008 - jreidinger(a)suse.cz + +- release file after copy to cache as soon as possible. + (bnc #381311) +- r9940 + +------------------------------------------------------------------- Fri May 2 16:28:05 CEST 2008 - schubi(a)suse.de - Bugfix: keep states by user has been removed it the -- 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] r9940 - in /trunk/libzypp/zypp: Fetcher.cc MediaSetAccess.cc MediaSetAccess.h
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 16:31:18 2008 New Revision: 9940 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9940&view=rev Log: release file after copy to cache as soon as possible. (bnc #381311) Modified: trunk/libzypp/zypp/Fetcher.cc trunk/libzypp/zypp/MediaSetAccess.cc trunk/libzypp/zypp/MediaSetAccess.h Modified: trunk/libzypp/zypp/Fetcher.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Fetcher.cc?rev=9940… ============================================================================== --- trunk/libzypp/zypp/Fetcher.cc (original) +++ trunk/libzypp/zypp/Fetcher.cc Fri May 2 16:31:18 2008 @@ -208,7 +208,7 @@ ZYPP_THROW( Exception("Can't copy " + tmp_file.asString() + " to " + dest_dir.asString())); } - + media.releaseFile((*it_res)->location); //not needed anymore, only eat space } catch (Exception & excpt_r) { Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?r… ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Fri May 2 16:31:18 2008 @@ -79,6 +79,25 @@ // report->finish( file_url, source::DownloadFileReport::NO_ERROR, "" ); // return file; + void MediaSetAccess::releaseFile( const OnMediaLocation & on_media_file ) + { + releaseFile( on_media_file.filename(), on_media_file.medianr() ); + } + + void MediaSetAccess::releaseFile( const Pathname & file, unsigned media_nr) + { + media::MediaManager media_mgr; + media::MediaAccessId media; + + media = getMediaAccessId( media_nr); + DBG << "Going to release file " << file + << " from media number " << media_nr << endl; + + if ( ! media_mgr.isAttached(media) ) + return; //disattached media is free + + media_mgr.releaseFile (media, file); + } Pathname MediaSetAccess::provideFile( const OnMediaLocation & on_media_file ) { Modified: trunk/libzypp/zypp/MediaSetAccess.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.h?re… ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.h (original) +++ trunk/libzypp/zypp/MediaSetAccess.h Fri May 2 16:31:18 2008 @@ -131,6 +131,24 @@ Pathname provideFile(const Pathname & file, unsigned media_nr = 1 ); /** + * Release file from media. + * This signal that file is not needed anymore. + * + * \param on_media_file location of the file on media + */ + void releaseFile( const OnMediaLocation & on_media_file ); + + + /** + * Release file from media. + * This signal that file is not needed anymore. + * + * \param file path to the file relative to media URL + * \param media_nr the media number in the media set + */ + void releaseFile(const Pathname & file, unsigned media_nr = 1 ); + + /** * Provides direcotry \a dir from media number \a media_nr. * * \param dir path to the directory relative to media URL -- 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] r9939 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 02 May '08

02 May '08

Author: schubi2 Date: Fri May 2 16:29:23 2008 New Revision: 9939 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9939&view=rev Log: bugfix for 385832 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 Fri May 2 16:29:23 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri May 2 16:28:05 CEST 2008 - schubi(a)suse.de + +- Bugfix: keep states by user has been removed it the + package has not been installed BUT has been recommended by another package. + (bnc #385832) +- rev 9938 + +------------------------------------------------------------------- Fri May 2 12:19:22 CEST 2008 - jreidinger(a)suse.cz - add isLocal function to Url which say if scheme is local or -- 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] r9938 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
by schubi2＠svn.opensuse.org 02 May '08

02 May '08

Author: schubi2 Date: Fri May 2 16:27:50 2008 New Revision: 9938 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9938&view=rev Log: - bugfix:keep states by user has been removed it the package has not been installed BUT has been recommended by another package. - cleanup logs Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Fri May 2 16:27:50 2008 @@ -276,17 +276,7 @@ r = item.status().setToBeUninstalled (causer); _XDEBUG("SATSolutionToPool(" << item << ", " << status << ") remove !" << r); } - - // recommend/suggest - if (status.isRecommended()) { - item.status().setRecommended(true); - _XDEBUG("SATSolutionToPool(" << item << ", " << status << ") recommended !" << r); - } - else if (status.isSuggested()) { - item.status().setSuggested(true); - _XDEBUG("SATSolutionToPool(" << item << ", " << status << ") suggested !" << r); - } - + return; } @@ -512,9 +502,8 @@ PoolItem poolItem = _pool.find (sat::Solvable(p)); if (poolItem) { - ResStatus status = poolItem.status(); - status.setRecommended (true); - SATSolutionToPool (poolItem, status, ResStatus::SOLVER); + poolItem.status().setRecommended(true); + _XDEBUG("SATSolutionToPool(" << poolItem << ") recommended !"); } else { ERR << "id " << p << " not found in ZYPP pool." << endl; } @@ -530,9 +519,8 @@ PoolItem poolItem = _pool.find (sat::Solvable(p)); if (poolItem) { - ResStatus status = poolItem.status(); - status.setSuggested (true); - SATSolutionToPool (poolItem, status, ResStatus::SOLVER); + poolItem.status().setSuggested(true); + _XDEBUG("SATSolutionToPool(" << poolItem << ") suggested !"); } else { ERR << "id " << p << " not found in ZYPP pool." << endl; } @@ -603,7 +591,7 @@ if (id == ID_NULL) { ERR << "Weaken: " << *iter << " not found" << endl; } - MIL << "Weaken dependencies of " << *iter << " with the SAT-Pool ID: " << id << endl; + MIL << "Weaken dependencies of " << *iter << endl; queue_push( &(_jobQueue), SOLVER_WEAKEN_SOLVABLE_DEPS ); queue_push( &(_jobQueue), id ); } @@ -634,14 +622,14 @@ if (id == ID_NULL) { ERR << "Install: " << *iter << " not found" << endl; } - MIL << "Install " << *iter << " with the SAT-Pool ID: " << id << endl; + MIL << "Install " << *iter << endl; queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); queue_push( &(_jobQueue), id ); } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { sat::detail::IdType ident( (*iter)->satSolvable().ident().id() ); - MIL << "Delete " << *iter << " with the string ID: " << ident << endl; + MIL << "Delete " << *iter << endl; queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); queue_push( &(_jobQueue), ident); } @@ -661,11 +649,11 @@ for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter != _items_to_lock.end(); iter++) { sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); if (iter->status().isInstalled()) { - MIL << "Lock installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Lock installed item " << *iter << endl; queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); queue_push( &(_jobQueue), ident ); } else { - MIL << "Lock NOT installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Lock NOT installed item " << *iter << endl; queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE ); queue_push( &(_jobQueue), ident ); } @@ -674,11 +662,11 @@ for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); iter++) { sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); if (iter->status().isInstalled()) { - MIL << "Keep installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Keep installed item " << *iter << endl; queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE | SOLVER_WEAK); queue_push( &(_jobQueue), ident ); } else { - MIL << "Keep NOT installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Keep NOT installed item " << *iter << ident << endl; queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK); queue_push( &(_jobQueue), ident ); } @@ -715,24 +703,24 @@ if (id == ID_NULL) { ERR << "Install: " << *iter << " not found" << endl; } - MIL << "Install " << *iter << " with the SAT-Pool ID: " << id << endl; + MIL << "Install " << *iter << endl; queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); queue_push( &(_jobQueue), id ); } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { sat::detail::IdType ident( (*iter)->satSolvable().ident().id() ); - MIL << "Delete " << *iter << " with the string ID: " << ident << endl; + MIL << "Delete " << *iter << ident << endl; queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); queue_push( &(_jobQueue), ident); } for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter != _items_to_lock.end(); iter++) { sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); if (iter->status().isInstalled()) { - MIL << "Lock installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Lock installed item " << *iter << ident << endl; queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); queue_push( &(_jobQueue), ident ); } else { - MIL << "Lock NOT installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Lock NOT installed item " << *iter << ident << endl; queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE ); queue_push( &(_jobQueue), ident ); } @@ -740,11 +728,11 @@ for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); iter++) { sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); if (iter->status().isInstalled()) { - MIL << "Keep installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Keep installed item " << *iter << ident << endl; queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE | SOLVER_WEAK); queue_push( &(_jobQueue), ident ); } else { - MIL << "Keep NOT installed item " << *iter << " with the string ID: " << ident << endl; + MIL << "Keep NOT installed item " << *iter << endl; queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK); queue_push( &(_jobQueue), ident ); } -- 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] r9937 - /trunk/zypper/src/zypper-richtext.cc
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 14:01:56 2008 New Revision: 9937 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9937&view=rev Log: fix seg fault in richtext if close tag come before any open. implment hr tag. Modified: trunk/zypper/src/zypper-richtext.cc Modified: trunk/zypper/src/zypper-richtext.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-richtext.cc?re… ============================================================================== --- trunk/zypper/src/zypper-richtext.cc (original) +++ trunk/zypper/src/zypper-richtext.cc Fri May 2 14:01:56 2008 @@ -76,6 +76,7 @@ if(tagStack.empty()) { WAR << "closing tag before any opening" << endl;; + return ""; } tags t = tagStack.back(); tagStack.pop_back(); @@ -111,9 +112,14 @@ tagStack.push_back(t); switch(t) { + case HR: + tagStack.pop_back(); //hr haven't closing tag + return "--------------------"; + case PARAGRAPH: return ""; case BREAK_LINE: + tagStack.pop_back(); //br haven't closing tag return "\n"; case OL: ordered = 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] r9936 - /trunk/zypper/package/zypper.changes
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 13:18:59 2008 New Revision: 9936 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9936&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 Fri May 2 13:18:59 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri May 2 13:22:02 CEST 2008 - jreidinger(a)suse.cz + +- implement keep-packages option to ar and mr +- Implement mr filter by local, remote or protocol specific + repositories and all option (no filter). +- r9935 + +------------------------------------------------------------------- Wed Apr 30 18:48:16 CEST 2008 - jkupec(a)suse.cz - abbreviate package summary in the search to fit screen width -- 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] r9935 - in /trunk/zypper/src: zypper-repos.cc zypper-repos.h zypper.cc
by jreidinger＠svn.opensuse.org 02 May '08

02 May '08

Author: jreidinger Date: Fri May 2 13:18:08 2008 New Revision: 9935 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9935&view=rev Log: implement keep-packages option to ar and mr Implement mr filter by local, remote or protocol specific repositories and all option (no filter). Modified: trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-repos.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=9… ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Fri May 2 13:18:08 2008 @@ -3,10 +3,12 @@ #include <boost/format.hpp> #include <boost/logic/tribool.hpp> #include <boost/lexical_cast.hpp> +#include <iterator> #include "zypp/ZYpp.h" #include "zypp/base/Logger.h" #include "zypp/base/IOStream.h" +#include "zypp/base/String.h" #include "zypp/RepoManager.h" #include "zypp/RepoInfo.h" @@ -1293,7 +1295,7 @@ void add_repo_by_url( Zypper & zypper, const zypp::Url & url, const string & alias, const string & type, - tribool enabled, tribool autorefresh) + tribool enabled, tribool autorefresh, tribool keepPackages) { MIL << "going to add repository by url (alias=" << alias << ", url=" << url << ")" << endl; @@ -1313,6 +1315,8 @@ repo.setEnabled((enabled == true)); if ( !indeterminate(autorefresh) ) repo.setAutorefresh((autorefresh == false)); + if ( !indeterminate(keepPackages) ) + repo.setKeepPackages(keepPackages); add_repo(zypper, repo); } @@ -1321,8 +1325,8 @@ //! \todo handle zypp exceptions void add_repo_from_file( Zypper & zypper, - const std::string & repo_file_url, - tribool enabled, tribool autorefresh) + const std::string & repo_file_url, tribool enabled, + tribool autorefresh, tribool keepPackages) { //! \todo handle local .repo files, validate the URI Url url = make_url(repo_file_url); @@ -1391,6 +1395,8 @@ repo.setEnabled((enabled == true)); if ( !indeterminate(autorefresh) ) repo.setAutorefresh((autorefresh == false)); + if ( !indeterminate(keepPackages) ) + repo.setKeepPackages(keepPackages); MIL << "enabled: " << repo.enabled() << " autorefresh: " << repo.autorefresh() << endl; add_repo(zypper, repo); @@ -1453,7 +1459,81 @@ } // ---------------------------------------------------------------------------- +void modify_repos_by_option( Zypper & zypper ) +{ + RepoManager manager(zypper.globalOpts().rm_options); + const std::list<RepoInfo>& repos = manager.knownRepositories(); + std::set<std::string> toModify; + + if ( copts.count("all") ) + { + for_(it, repos.begin(),repos.end()) + { + string alias = it->alias(); + modify_repo( zypper, alias ); + } + return; //no more repository is possible + } + + if ( copts.count("local") ) + { + for_(it, repos.begin(),repos.end()) + { + for_( it2,it->baseUrlsBegin(), it->baseUrlsEnd() ) + { + if ( it2->isLocal() ) + { + string alias = it->alias(); + toModify.insert( alias ); + break; + } + } + } + } + + if ( copts.count("remote") ) + { + for_(it, repos.begin(),repos.end()) + { + for_( it2,it->baseUrlsBegin(), it->baseUrlsEnd() ) + { + if ( !it2->isLocal() ) + { + string alias = it->alias(); + toModify.insert( alias ); + break; + } + } + } + } + + if ( copts.count("medium-type") ) + { + string par = copts["medium-type"].front(); + std::set<string> scheme; + insert_iterator<std::set<string> > ii (scheme,scheme.begin()); + str::split( par, ii, ","); + + for_(it, repos.begin(),repos.end()) + { + for_( it2,it->baseUrlsBegin(), it->baseUrlsEnd() ) + { + if ( scheme.find(it2->getScheme())!= scheme.end() ) + { + string alias = it->alias(); + toModify.insert( alias ); + break; + } + } + } + } + + for_(it, toModify.begin(), toModify.end()) + { + modify_repo( zypper, *it ); + } +} void modify_repo(Zypper & zypper, const string & alias) { // tell whether currenlty processed options are contradicting each other @@ -1499,6 +1579,24 @@ } DBG << "autoref = " << autoref << endl; + tribool keepPackages = indeterminate; + if (copts.count("keep-packages")) + keepPackages = true; + if (copts.count("no-keep-packages")) + { + if (keepPackages) + { + zypper.out().warning(boost::str(format(msg_contradition) + % "--keep-packages" % "--no-keep-package")); + + keepPackages = indeterminate; + } + else + keepPackages = false; + } + DBG << "keepPackages = " << keepPackages << endl; + + try { RepoManager manager(zypper.globalOpts().rm_options); @@ -1506,6 +1604,7 @@ bool chnaged_enabled = false; bool changed_autoref = false; bool changed_prio = false; + bool changed_keeppackages = false; if (!indeterminate(enable)) { @@ -1521,6 +1620,13 @@ repo.setAutorefresh(autoref); } + if (!indeterminate(keepPackages)) + { + if (keepPackages != repo.keepPackages()) + changed_keeppackages = true; + repo.setKeepPackages(keepPackages); + } + int prio = 0; parsed_opts::const_iterator tmp1; if ((tmp1 = zypper.cOpts().find("priority")) != zypper.cOpts().end()) @@ -1549,7 +1655,8 @@ } } - if (chnaged_enabled || changed_autoref || changed_prio) + if (chnaged_enabled || changed_autoref || changed_prio + || changed_keeppackages) { manager.modifyRepository(alias, repo); @@ -1573,6 +1680,16 @@ _("Autorefresh has been disabled for repository '%s'.")) % alias)); } + if (changed_keeppackages) + { + if (repo.keepPackages()) + zypper.out().info(boost::str(format( + _("Keep packages has been enabled for repository '%s'.")) % alias)); + else + zypper.out().info(boost::str(format( + _("Keep packages has been disabled for repository '%s'.")) % alias)); + } + if (changed_prio) { zypper.out().info(boost::str(format( Modified: trunk/zypper/src/zypper-repos.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.h?rev=99… ============================================================================== --- trunk/zypper/src/zypper-repos.h (original) +++ trunk/zypper/src/zypper-repos.h Fri May 2 13:18:08 2008 @@ -80,7 +80,8 @@ const std::string & alias, const std::string & type = "", boost::tribool enabled = boost::indeterminate, - boost::tribool autorefresh = boost::indeterminate); + boost::tribool autorefresh = boost::indeterminate, + boost::tribool keepPackages = boost::indeterminate); /** * Add repository specified in given repo file on \a repo_file_url. All repos @@ -94,7 +95,9 @@ void add_repo_from_file(Zypper & zypper, const std::string & repo_file_url, boost::tribool enabled = boost::indeterminate, - boost::tribool autorefresh = boost::indeterminate); + boost::tribool autorefresh = boost::indeterminate, + boost::tribool keepPackages = boost::indeterminate); + /** * Add repository specified by \repo to system repositories. @@ -120,6 +123,18 @@ void modify_repo(Zypper & zypper, const std::string & alias); /** + * Modify all repositories properties. + * + */ +void modify_all_repos(Zypper & zypper); + +/** + * Modify repositories which is matching filter options + * like all, local, remote or medium-type + */ +void modify_repos_by_option( Zypper & zypper ); + +/** * Load both repository and target resolvables. * * \see load_repo_resolvables(bool) Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9935&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri May 2 13:18:08 2008 @@ -944,6 +944,8 @@ {"check", no_argument, 0, 'c'}, {"no-check", no_argument, 0, 'x'}, {"name", no_argument, 0, 'n'}, + {"keep-packages", no_argument, 0, 'k'}, + {"no-keep-packages", no_argument, 0, 'K'}, //TODO not documented {0, 0, 0, 0} }; specific_options = service_add_options; @@ -1067,6 +1069,12 @@ {"no-refresh", no_argument, 0, 'n'}, {"disable-autorefresh", no_argument, 0, 0 }, // backward compatibility {"priority", required_argument, 0, 'p'}, + {"keep-packages", no_argument, 0, 'k'}, + {"no-keep-packages", no_argument, 0, 'K'}, //TODO not documented + {"all", no_argument, 0, 'A' }, //TODO not documented + {"local", no_argument, 0, 'l' }, //TODO not documented + {"remote", no_argument, 0, 't' }, //TODO not documented + {"medium-type", required_argument, 0, 'm' }, //TODO not documented {0, 0, 0, 0} }; specific_options = service_modify_options; @@ -1919,12 +1927,18 @@ if (copts.count("disable") || copts.count("disabled")) enabled = false; + tribool keepPackages; + if (copts.count("keep-packages")) + keepPackages = true; + else if (copts.count("no-keep-packages")) + keepPackages = false; + try { // add repository specified in .repo file if (copts.count("repo")) { - add_repo_from_file(*this,copts["repo"].front(), enabled); + add_repo_from_file(*this,copts["repo"].front(), enabled, keepPackages); return; } @@ -1971,7 +1985,7 @@ } else { - add_repo_from_file(*this,_arguments[0], enabled); + add_repo_from_file(*this,_arguments[0], enabled, keepPackages); break; } case 2: @@ -2003,7 +2017,7 @@ init_target(*this); add_repo_by_url( - *this, url, _arguments[1]/*alias*/, type, enabled); + *this, url, _arguments[1]/*alias*/, type, enabled, keepPackages); return; } } @@ -2145,8 +2159,12 @@ return; } - if (_arguments.size() < 1) + bool non_alias = copts.count("all") || copts.count("local") || + copts.count("remote") || copts.count("medium-type"); + + if (_arguments.size() < 1 && !non_alias) { + //TODO add all option to help text out().error(_("Alias is a required argument.")); ERR << "No alias argument given." << endl; out().info(_command_help); @@ -2154,23 +2172,31 @@ return; } // too many arguments - if (_arguments.size() > 1) + if (_arguments.size() > 1 + || (_arguments.size() > 0 && non_alias)) { report_too_many_arguments(_command_help); setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } - - RepoInfo repo; - if (match_repo(*this,_arguments[0],&repo)) + + if (non_alias) { - modify_repo(*this, repo.alias()); + modify_repos_by_option(*this); } - else + else { - out().error( - boost::str(format(_("Repository %s not found.")) % _arguments[0])); - ERR << "Repo " << _arguments[0] << " not found" << endl; + RepoInfo repo; + if (match_repo(*this,_arguments[0],&repo)) + { + modify_repo(*this, repo.alias()); + } + else + { + out().error( + boost::str(format(_("Repository %s not found.")) % _arguments[0])); + ERR << "Repo " << _arguments[0] << " not found" << endl; + } } break; @@ -2338,6 +2364,7 @@ repo.setAutorefresh(true); repo.setAlias(TMP_RPM_REPO_ALIAS); repo.setName(_("Plain RPM files cache")); + repo.setKeepPackages(false); // shut up zypper Out::Verbosity tmp = out().verbosity(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0