Author: jkupec Date: Fri Nov 23 19:16:08 2007 New Revision: 7906 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7906&view=rev Log: - gopts removed Modified: trunk/zypper/src/zypper-main.cc trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypper-main.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-main.cc?rev=7906&r1=7905&r2=7906&view=diff ============================================================================== --- trunk/zypper/src/zypper-main.cc (original) +++ trunk/zypper/src/zypper-main.cc Fri Nov 23 19:16:08 2007 @@ -25,7 +25,7 @@ { struct Bye { ~Bye() { - cerr_vv << "Exiting main()" << endl; + MIL << "Exiting main()" << endl; } } say_goodbye __attribute__ ((__unused__)); Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7906&r1=7905&r2=7906&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri Nov 23 19:16:08 2007 @@ -48,7 +48,6 @@ ZYpp::Ptr God = NULL; RuntimeData gData; Settings gSettings; -parsed_opts gopts; // global options parsed_opts copts; // command options @@ -132,7 +131,7 @@ }; // parse global options - gopts = _gopts = parse_options (_argc, _argv, global_options); + _gopts = parse_options (_argc, _argv, global_options); if (gOpts().count("_unknown")) { setExitCode(ZYPPER_EXIT_ERR_SYNTAX); @@ -155,7 +154,9 @@ "\t--raw-cache-dir <dir>\tUse alternative raw meta-data cache directory\n" ); - if (gopts.count("rug-compatible")) + parsed_opts::const_iterator it; + + if (gOpts().count("rug-compatible")) gSettings.is_rug_compatible = true; // Help is parsed by setting the help flag for a command, which may be empty @@ -164,43 +165,45 @@ // The help command is eaten and transformed to the help option // $0 help // $0 help command - if (gopts.count("help")) + if (gOpts().count("help")) setRunningHelp(true); - if (gopts.count("quiet")) { + if (gOpts().count("quiet")) { gSettings.verbosity = -1; DBG << "Verbosity " << gSettings.verbosity << endl; } - if (gopts.count("verbose")) { - gSettings.verbosity += gopts["verbose"].size(); + if ((it = gOpts().find("verbose")) != gOpts().end()) { + gSettings.verbosity += it->second.size(); + +// gSettings.verbosity += gOpts()["verbose"].size(); cout << format(_("Verbosity: %d")) % gSettings.verbosity << endl; DBG << "Verbosity " << gSettings.verbosity << endl; } - if (gopts.count("non-interactive")) { + if (gOpts().count("non-interactive")) { gSettings.non_interactive = true; cout_n << _("Entering non-interactive mode.") << endl; MIL << "Entering non-interactive mode" << endl; } - if (gopts.count("no-gpg-checks")) { + if (gOpts().count("no-gpg-checks")) { gSettings.no_gpg_checks = true; cout_n << _("Entering no-gpg-checks mode.") << endl; MIL << "Entering no-gpg-checks mode" << endl; } - if (gopts.count("table-style")) { + if ((it = gOpts().find("table-style")) != gOpts().end()) { unsigned s; - str::strtonum (gopts["table-style"].front(), s); + str::strtonum (it->second.front(), s); if (s < _End) Table::defaultStyle = (TableStyle) s; else cerr << _("Invalid table style ") << s << endl; } - if (gopts.count("root")) { - gSettings.root_dir = gopts["root"].front(); + if ((it = gOpts().find("root")) != gOpts().end()) { + gSettings.root_dir = it->second.front(); Pathname tmp(gSettings.root_dir); if (!tmp.absolute()) { @@ -218,31 +221,31 @@ + gSettings.rm_options.repoRawCachePath; } - if (gopts.count("reposd-dir")) { - gSettings.rm_options.knownReposPath = gopts["reposd-dir"].front(); + if ((it = gOpts().find("reposd-dir")) != gOpts().end()) { + gSettings.rm_options.knownReposPath = it->second.front(); } - if (gopts.count("cache-dir")) { - gSettings.rm_options.repoCachePath = gopts["cache-dir"].front(); + if ((it = gOpts().find("cache-dir")) != gOpts().end()) { + gSettings.rm_options.repoCachePath = it->second.front(); } - if (gopts.count("raw-cache-dir")) { - gSettings.rm_options.repoRawCachePath = gopts["raw-cache-dir"].front(); + if ((it = gOpts().find("raw-cache-dir")) != gOpts().end()) { + gSettings.rm_options.repoRawCachePath = it->second.front(); } DBG << "repos.d dir = " << gSettings.rm_options.knownReposPath << endl; DBG << "cache dir = " << gSettings.rm_options.repoCachePath << endl; DBG << "raw cache dir = " << gSettings.rm_options.repoRawCachePath << endl; - if (gopts.count("terse")) + if (gOpts().count("terse")) { gSettings.machine_readable = true; cout << "<?xml version='1.0'?>" << endl; cout << "<stream>" << endl; } - if (gopts.count("disable-repositories") || - gopts.count("disable-system-sources")) + if (gOpts().count("disable-repositories") || + gOpts().count("disable-system-sources")) { MIL << "Repositories disabled, using target only." << endl; cout_n << @@ -255,16 +258,16 @@ MIL << "System sources enabled" << endl; } - if (gopts.count("disable-system-resolvables")) + if (gOpts().count("disable-system-resolvables")) { MIL << "System resolvables disabled" << endl; cout_v << _("Ignoring installed resolvables...") << endl; gSettings.disable_system_resolvables = true; } /* - if (gopts.count("source")) + if (gOpts().count("source")) { - list<string> sources = gopts["source"]; + list<string> sources = gOpts()["source"]; for (list<string>::const_iterator it = sources.begin(); it != sources.end(); ++it ) { Url url = make_url (*it); @@ -276,9 +279,9 @@ } */ // testing option - if (gopts.count("opt")) { + if ((it = gOpts().find("opt")) != gOpts().end()) { cout << "Opt arg: "; - std::copy (gopts["opt"].begin(), gopts["opt"].end(), + std::copy (it->second.begin(), it->second.end(), ostream_iterator<string> (cout, ", ")); cout << endl; } @@ -332,7 +335,7 @@ { if (runningHelp()) cout << help_global_options << endl << help_commands; - else if (gopts.count("version")) + else if (gOpts().count("version")) cout << PACKAGE " " VERSION << endl; else { Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=7906&r1=7905&r2=7906&view=diff ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Fri Nov 23 19:16:08 2007 @@ -19,11 +19,6 @@ ~Zypper(); int main(int argc, char ** argv); - void processGlobalOptions(); - void processCommandOptions(); - void commandShell(); - void safeDoCommand(); - void doCommand(); // setters & getters const parsed_opts & gOpts() const { return _gopts; } @@ -39,6 +34,12 @@ char ** argv() { return _running_shell ? _sh_argv : _argv; } private: + void processGlobalOptions(); + void processCommandOptions(); + void commandShell(); + void safeDoCommand(); + void doCommand(); + void setCommand(const ZypperCommand & command) { _command = command; } void setRunningShell(bool value) { _running_shell = value; } void setRunningHelp(bool value) { _running_help = value; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org