Author: jkupec Date: Sat Aug 4 23:40:03 2007 New Revision: 6476 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6476&view=rev Log: - new refresh options added: --force, --force-build, --force-download, --build-only, --download-only Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper-sources.cc trunk/zypper/src/zypper.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=6476&r1=6475&r2=6476&view=diff ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Sat Aug 4 23:40:03 2007 @@ -274,8 +274,24 @@ Refresh repositories specified by their alias or number. If no repositories are specified, all enabled repositories will be refreshed. .IP Refreshing a repository means downloading metadata of resolvables from media (if needed), storing it in local cache (typically under /var/cache/zypp/raw/<alias> directory) and preparsing the metadata into an sqlite database (/var/cache/zypp/zypp.db). +.TP +.I \-f, \-\-force +Force a complete refresh of specified repositories. This option will cause both the download of raw metadata and parsing of the metadata to be forced even if everything indicates a refresh is not needed. +.TP +.I \-b, \-\-force\-build +Force only reparsing of cached metadata and rebuilding of the database. Raw metadata download will not be forced. +.TP +.I \-d, \-\-force\-download +Force only download of current copy of repository metadata. Parsing and rebuild of the database will not be forced. +.TP +.I \-B, \-\-build\-only +Only parse the metadata and build the database, don't download raw metadata into the cache. This will enable you to repair damaged database from cached data without accessing network at all. +.TP +.I \-D, \-\-download\-only +Only download the raw metadata, don't parse it or build the database. .SH "GLOBAL OPTIONS" + .TP .I \-h, \-\-help Help. If a \fBcommand\fR is specified together with --help option, command specific help is displayed. Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev=6476&r1=6475&r2=6476&view=diff ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Sat Aug 4 23:40:03 2007 @@ -312,11 +312,38 @@ // do the refresh try { - cout_n << format(_("Refreshing '%s'")) % it->alias() << endl; - manager.refreshMetadata(repo, RepoManager::RefreshIfNeeded); + if (!copts.count("build-only")) + { + bool force_download = + copts.count("force") || copts.count("force-download"); + + cout_n << format(_("Refreshing '%s'")) % it->alias(); + if (force_download) + cout_n << " " << _("(forced)"); + cout_n << endl; - cout_v << _("Creating repository cache...") << endl; - manager.buildCache(repo, RepoManager::BuildIfNeeded); + MIL << "calling refreshMetadata" << (force_download ? ", forced" : "") + << endl; + + manager.refreshMetadata(repo, force_download ? + RepoManager::RefreshForced : RepoManager::RefreshIfNeeded); + } + + if (!copts.count("download-only")) + { + bool force_build = + copts.count("force") || copts.count("force-build"); + + cout_v << _("Creating repository cache"); + if (force_build) + cout_v << " " << _("(forced)"); + cout_v << endl; + + MIL << "calling buildCache" << (force_build ? ", forced" : "") << endl; + + manager.buildCache(repo, force_build ? + RepoManager::BuildForced : RepoManager::BuildIfNeeded); + } //cout_n << _("DONE") << endl << endl; } Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=6476&r1=6475&r2=6476&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Sat Aug 4 23:40:03 2007 @@ -415,6 +415,11 @@ } else if (command == ZypperCommand::REFRESH) { static struct option refresh_options[] = { + {"force", no_argument, 0, 'f'}, + {"force-build", no_argument, 0, 'b'}, + {"force-download", no_argument, 0, 'd'}, + {"build-only", no_argument, 0, 'B'}, + {"download-only", no_argument, 0, 'D'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; @@ -425,7 +430,12 @@ "Refresh repositories specified by their alias or number." " If none are specified, all enabled repositories will be refreshed.\n" "\n" - "This command has no additional options.\n" + " Command options:\n" + "-f, --force Force a complete refresh\n" + "-b, --force-build Force rebuild of the database\n" + "-d, --force-download Force download of raw metadata\n" + "-B, --build-only Only build the database, don't download metadata.\n" + "-D, --download-only Only download raw metadata, don't build the database\n" ); } else if (command == ZypperCommand::LIST_UPDATES) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org