[zypp-commit] r11503 - in /trunk/zypper: doc/zypper.8 src/Zypper.cc src/Zypper.h src/repos.cc

Author: jkupec Date: Mon Oct 27 14:03:13 2008 New Revision: 11503 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11503&view=rev Log: - --no-cd global option added to ignore CD/DVD repositories (bnc #336211) - --no-remote global option added to ignore remote (downloading) repositories Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/Zypper.cc trunk/zypper/src/Zypper.h trunk/zypper/src/repos.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11503&r1=11502&r2=11503&view=diff ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Mon Oct 27 14:03:13 2008 @@ -1108,6 +1108,14 @@ Do not auto-refresh repositories (ignore the auto-refresh setting). Useful to save time when doing operations like search, if there is not a need to have a completely up to date metadata. +.TP +.I \ \ \ \ \-\-no\-cd +Ignore CD/DVD repositories. When this option is specified, zypper acts as if +the CD/DVD repositories were not defined at all. +.TP +.I \ \ \ \ \-\-no\-remote +Ignore remote repositories like http, ftp, smb and similar. When this option +is specified, zypper acts as if the remote repositories were not defined at all. .LP Target Options: .TP Modified: trunk/zypper/src/Zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.cc?rev=11503&r1=11502&r2=11503&view=diff ============================================================================== --- trunk/zypper/src/Zypper.cc (original) +++ trunk/zypper/src/Zypper.cc Mon Oct 27 14:03:13 2008 @@ -168,12 +168,16 @@ "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory.\n" ); - static string help_global_source_options = _(" Repository Options:\n" + static string help_global_repo_options = string(_(" Repository Options:\n" "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n" "\t--plus-repo, -p <URI>\tUse an additional repository.\n" "\t--disable-repositories\tDo not read meta-data from repositories.\n" "\t--no-refresh\t\tDo not refresh the repositories.\n" - ); + )) + string(_( + // translators: these belong to Repository Options main help text + "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" + "\t--no-remote\t\tIgnore remote repositories.\n" + )); static string help_global_target_options = _(" Target Options:\n" "\t--root, -R <dir>\tOperate on a different root directory.\n" @@ -260,7 +264,7 @@ zypper.out().info(help_usage, Out::QUIET); zypper.out().info(help_global_options, Out::QUIET); - zypper.out().info(help_global_source_options, Out::QUIET); + zypper.out().info(help_global_repo_options, Out::QUIET); zypper.out().info(help_global_target_options, Out::QUIET); zypper.out().info(help_commands, Out::QUIET); zypper.out().info(help_repo_commands, Out::QUIET); @@ -329,6 +333,8 @@ {"plus-repo", required_argument, 0, 'p'}, {"disable-repositories", no_argument, 0, 0 }, {"no-refresh", no_argument, 0, 0 }, + {"no-cd", no_argument, 0, 0 }, + {"no-remote", no_argument, 0, 0 }, {"xmlout", no_argument, 0, 'x'}, {0, 0, 0, 0} }; @@ -497,6 +503,20 @@ MIL << "Autorefresh disabled." << endl; } + if (gopts.count("no-cd")) + { + _gopts.no_cd = true; + out().info(_("CD/DVD repositories disabled."), Out::HIGH); + MIL << "No CD/DVD repos." << endl; + } + + if (gopts.count("no-remote")) + { + _gopts.no_remote = true; + out().info(_("Remote repos disabled."), Out::HIGH); + MIL << "No remote repos." << endl; + } + if (gopts.count("disable-system-resolvables")) { MIL << "System resolvables disabled" << endl; @@ -732,7 +752,7 @@ // runtime data _rdata.current_repo = RepoInfo(); - + // cause the RepoManager to be reinitialized _rm.reset(); @@ -1048,7 +1068,7 @@ ); break; } - + case ZypperCommand::MODIFY_SERVICE_e: { static struct option service_modify_options[] = { @@ -1100,7 +1120,7 @@ "-m, --medium-type <type> Apply changes to services of specified type.\n" ), "--all|--remote|--local|--medium-type" , "--all, --remote, --local, --medium-type"); - // ---------|---------|---------|---------|---------|---------|---------|--------- + // ---------|---------|---------|---------|---------|---------|---------|--------- break; } @@ -3479,7 +3499,7 @@ } else if (command() == ZypperCommand::LIST_PATCHES) kinds.insert(ResKind::patch); - else + else kinds.insert(ResKind::package); bool best_effort = copts.count( "best-effort" ); @@ -3825,9 +3845,9 @@ break; } - + // ----------------------------(utils/others)-------------------------------- - + case ZypperCommand::TARGET_OS_e: { if (runningHelp()) { out().info(_command_help, Out::QUIET); return; } @@ -3836,7 +3856,7 @@ init_target(*this); out().info(God->target()->targetDistribution()); - + break; } @@ -3856,7 +3876,7 @@ setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); return; } - + Edition lhs(_arguments[0]); Edition rhs(_arguments[1]); Modified: trunk/zypper/src/Zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/Zypper.h?rev=11503&r1=11502&r2=11503&view=diff ============================================================================== --- trunk/zypper/src/Zypper.h (original) +++ trunk/zypper/src/Zypper.h Mon Oct 27 14:03:13 2008 @@ -17,7 +17,7 @@ #include "zypp/TriBool.h" #include "zypp/RepoInfo.h" -#include "zypp/RepoManager.h" // for RepoManagerOptions +#include "zypp/RepoManager.h" // for RepoManagerOptions #include "zypp/SrcPackage.h" #include "Command.h" @@ -35,7 +35,7 @@ { GlobalOptions() : - verbosity(0), + verbosity(0), disable_system_sources(false), disable_system_resolvables(false), is_rug_compatible(false), @@ -43,6 +43,8 @@ no_gpg_checks(false), machine_readable(false), no_refresh(false), + no_cd(false), + no_remote(false), root_dir("/"), no_abbrev(false), terse(false), @@ -54,7 +56,7 @@ /** * Level of the amount of output. * - * <ul> + * <ul> * <li>-1 quiet</li> * <li> 0 normal (default)</li> * <li> 1 verbose</li> @@ -70,6 +72,10 @@ bool machine_readable; /** Whether to disable autorefresh. */ bool no_refresh; + /** Whether to ignore cd/dvd repos) */ + bool no_cd; + /** Whether to ignore remote (http, ...) repos */ + bool no_remote; std::string root_dir; zypp::RepoManagerOptions rm_options; bool no_abbrev; @@ -137,7 +143,7 @@ unsigned int commit_pkgs_total; unsigned int commit_pkg_current; - + bool seen_verify_hint; bool action_rpm_download; }; @@ -150,7 +156,7 @@ typedef zypp::RW_pointer Ptr; typedef std::vectorstd::string ArgList; - static Ptr & instance(); + static Ptr & instance(); int main(int argc, char ** argv); @@ -166,13 +172,13 @@ zypp::RepoManager & repoManager() { if (!_rm) _rm.reset(new zypp::RepoManager(_gopts.rm_options)); return *_rm; } int exitCode() const { return _exit_code; } - void setExitCode(int exit) { _exit_code = exit; } + void setExitCode(int exit) { _exit_code = exit; } bool runningShell() const { return _running_shell; } bool runningHelp() const { return _running_help; } - bool exitRequested() const { return _exit_requested; } + bool exitRequested() const { return _exit_requested; } void requestExit() { _exit_requested = true; } - int argc() { return _running_shell ? _sh_argc : _argc; } + int argc() { return _running_shell ? _sh_argc : _argc; } char ** argv() { return _running_shell ? _sh_argv : _argv; } void cleanup(); Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=11503&r1=11502&r2=11503&view=diff ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Mon Oct 27 14:03:13 2008 @@ -60,7 +60,7 @@ const RepoInfo & repo, bool force_download) { - RuntimeData & gData = zypper.runtimeData(); + RuntimeData & gData = zypper.runtimeData(); gData.current_repo = repo; bool do_refresh = false; string & plabel = zypper.runtimeData().raw_refresh_progress_label; @@ -479,6 +479,29 @@ } } + bool no_cd = zypper.globalOpts().no_cd; + bool no_remote = zypper.globalOpts().no_remote; + for (list<RepoInfo>::iterator it = gData.repos.begin(); it != gData.repos.end();) + { + if (no_cd && (it->baseUrlsBegin()->getScheme() == "cd" + || it->baseUrlsBegin()->getScheme() == "dvd")) + { + zypper.out().info(str::form( + _("Ignoring repository '%s' because of '%s' option."), + it->name().c_str(), "no-cd")); + gData.repos.erase(it++); + } + if (no_remote && MediaAccess::downloads(*it->baseUrlsBegin())) + { + zypper.out().info(str::form( + _("Ignoring repository '%s' because of '%s' option."), + it->name().c_str(), "no-remote")); + gData.repos.erase(it++); + } + else + ++it; + } + for (std::list<RepoInfo>::iterator it = gData.repos.begin(); it != gData.repos.end(); ++it) { @@ -801,7 +824,7 @@ void list_repos(Zypper & zypper) { RepoManager & manager = zypper.repoManager(); - RuntimeData & gData = zypper.runtimeData(); + RuntimeData & gData = zypper.runtimeData(); list<RepoInfo> repos; try @@ -1222,7 +1245,7 @@ void add_repo(Zypper & zypper, RepoInfo & repo) { RepoManager & manager = zypper.repoManager(); - RuntimeData & gData = zypper.runtimeData(); + RuntimeData & gData = zypper.runtimeData(); bool is_cd = true; for(RepoInfo::urls_const_iterator it = repo.baseUrlsBegin(); @@ -1490,13 +1513,13 @@ void rename_repo(Zypper & zypper, const std::string & alias, const std::string & newalias) -{ +{ RepoManager & manager = zypper.repoManager(); try { RepoInfo repo(manager.getRepositoryInfo(alias)); - + if (!repo.service().empty()) { zypper.out().error(str::form( @@ -1548,7 +1571,7 @@ } return; //no more repository is possible } - + if ( copts.count("local") ) { for_(it, repos.begin(),repos.end()) @@ -1726,7 +1749,7 @@ zypper.out().info(boost::str(format( _("Repository '%s' priority has been set to %d.")) % alias % prio)); } - + if (!name.empty()) { zypper.out().info(boost::str(format( @@ -1805,7 +1828,7 @@ { // match by alias or number found = (*known_it)->alias() == str || tmp == number; - + // match by URL if (!found) { @@ -1819,7 +1842,7 @@ if (zypper.cOpts().count("loose-query")) urlview = urlview - url::ViewOptions::WITH_QUERY_STR; - ServiceInfo_Ptr s_ptr = dynamic_pointer_cast<ServiceInfo>(*known_it); + ServiceInfo_Ptr s_ptr = dynamic_pointer_cast<ServiceInfo>(*known_it); if (!(urlview.has(url::ViewOptions::WITH_PASSWORD) && urlview.has(url::ViewOptions::WITH_QUERY_STR))) @@ -1909,7 +1932,7 @@ ServiceInfo_Ptr s_ptr = dynamic_pointer_cast<ServiceInfo>(*serv_it); ServiceInfo_Ptr current_service_ptr = dynamic_pointer_cast<ServiceInfo>(service); - // one is a service, the other is a repo + // one is a service, the other is a repo if (s_ptr && !current_service_ptr) continue; @@ -1959,7 +1982,7 @@ SF_SHOW_URI = 1, SF_SHOW_PRIO = 1 << 1, SF_SHOW_WITH_REPOS = 1 << 2, - SF_SERVICE_REPO = 1 << 15 + SF_SERVICE_REPO = 1 << 15 }; ZYPP_DECLARE_FLAGS(ServiceListFlags,ServiceListFlagsBits); @@ -2132,10 +2155,10 @@ static void print_xml_service_list(Zypper & zypper, const list & services) { - //string type = - + //string type = + cout << "<service-list>" << endl; - + ServiceInfo_Ptr s_ptr; for (list::const_iterator it = services.begin(); @@ -2326,7 +2349,7 @@ MIL << "going to refresh services" << endl; ServiceList services = get_all_services(zypper); - + // get the list of repos specified on the command line ... ServiceList specified; list<string> not_found; @@ -2371,7 +2394,7 @@ { string msg = boost::str( format(_("Skipping disabled service '%s'")) % service_ptr->name()); - DBG << "skipping disabled service '" << service_ptr->alias() << "'" << endl; + DBG << "skipping disabled service '" << service_ptr->alias() << "'" << endl; if (specified.empty()) zypper.out().info(msg, Out::HIGH); @@ -2426,7 +2449,7 @@ } else enabled_service_count = 0; - + // print the result message if (enabled_service_count == 0) { @@ -2474,7 +2497,7 @@ { RepoManager & manager = zypper.repoManager(); ServiceInfo srv(manager.getService(alias)); - + bool chnaged_enabled = false; bool changed_autoref = false; @@ -2504,7 +2527,7 @@ set<string> artodisable; set<string> rrtoenable; set<string> rrtodisable; - + // RIS repos to enable if (zypper.cOpts().count("cl-to-enable")) { @@ -2657,7 +2680,7 @@ ServiceInfo_Ptr sptr; RepoInfo_Ptr rptr; - + if ( copts.count("all") ) { for_(it, known.begin(), known.end()) @@ -2746,10 +2769,10 @@ void load_repo_resolvables(Zypper & zypper) { RepoManager & manager = zypper.repoManager(); - RuntimeData & gData = zypper.runtimeData(); + RuntimeData & gData = zypper.runtimeData(); zypper.out().info(_("Loading repository data...")); - + for (std::list<RepoInfo>::iterator it = gData.repos.begin(); it != gData.repos.end(); ++it) { @@ -2795,7 +2818,7 @@ if ( robj != Repository::noRepository && robj.maybeOutdated() ) { - + zypper.out().warning(boost::str(format( _("Repository '%s' appears to outdated. Consider using a different mirror or server.")) % repo.name()), Out::QUIET); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org