Author: jkupec Date: Thu Jul 12 12:58:07 2007 New Revision: 5984 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5984&view=rev Log: - s/source/repository in zypper texts, help page will follow Modified: trunk/zypper/src/zypp-checkpatches.cc trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-search.cc trunk/zypper/src/zypper-search.h trunk/zypper/src/zypper-sources.cc trunk/zypper/src/zypper-sources.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypp-checkpatches.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypp-checkpatches.cc?rev=5984&r1=5983&r2=5984&view=diff ============================================================================== --- trunk/zypper/src/zypp-checkpatches.cc (original) +++ trunk/zypper/src/zypp-checkpatches.cc Thu Jul 12 12:58:07 2007 @@ -154,18 +154,18 @@ if ( (scheme == "cd" || scheme == "dvd") ) { - MIL << "Skipping CD/DVD source: url:[" << (it->baseUrlsBegin())->asString() << "] alias:[" << it->alias() << "] auto_refresh:[ " << it->autorefresh() << "]" << endl; + MIL << "Skipping CD/DVD repository: url:[" << (it->baseUrlsBegin())->asString() << "] alias:[" << it->alias() << "] auto_refresh:[ " << it->autorefresh() << "]" << endl; continue; } if ( ! it->enabled() ) { - MIL << "Skipping disabled source: url:[" << url.asString() << "] alias:[" << it->alias() << "] auto_refresh:[ " << it->autorefresh() << "]" << endl; + MIL << "Skipping disabled repository: url:[" << url.asString() << "] alias:[" << it->alias() << "] auto_refresh:[ " << it->autorefresh() << "]" << endl; continue; } // Note: Url(it->url).asString() to hide password in logs - MIL << "Creating source: url:[" << url.asString() << "] alias:[" << it->alias() << "] auto_refresh:[ " << it->autorefresh() << "]" << endl; + MIL << "Creating repository: url:[" << url.asString() << "] alias:[" << it->alias() << "] auto_refresh:[ " << it->autorefresh() << "]" << endl; try { @@ -174,7 +174,7 @@ token_stream << "[" << it->alias() << "| " << *(it->baseUrlsBegin()) << "]"; // src.timestamp() << "]"; - MIL << "Source: " << it->alias() << std::endl; //" from " << src.timestamp() << std::endl; + MIL << "repository: " << it->alias() << std::endl; //" from " << src.timestamp() << std::endl; gData.repos.push_back(*it); } @@ -182,7 +182,7 @@ { // TranslatorExplanation %s = detailed low level (unstranslated) error message string error = excpt_r.msg(); - gData.errors.push_back(str::form(_("Couldn't restore source.\nDetail: %s"), error.c_str())); + gData.errors.push_back(str::form(_("Couldn't restore repository.\nDetail: %s"), error.c_str())); } } @@ -232,7 +232,7 @@ if ( gData.repos.size() == 0 ) { - gData.errors.push_back( str::form( _( "There are no update sources defined. Please add one or more update sources in order to be notified of updates.") ) ); + gData.errors.push_back( str::form( _( "There are no update repositories defined. Please add one or more update repositories in order to be notified of updates.") ) ); } God->addResolvables( God->target()->resolvables(), true); Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=5984&r1=5983&r2=5984&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Thu Jul 12 12:58:07 2007 @@ -879,12 +879,12 @@ if (excpt_r.msg().find("fails integrity check") != string::npos) { cerr << endl << _("Package integrity check failed. This may be a problem" - " with installation source or media. Try one of the following:\n" + " with repository or media. Try one of the following:\n" "\n" "- just retry previous command\n" - "- refresh installation sources using 'zypper refresh'\n" + "- refresh repositories using 'zypper refresh'\n" "- use another installation media (if e.g. damaged)\n" - "- use another installation source") << endl; + "- use another repository") << endl; return ZYPPER_EXIT_ERR_ZYPP; } else Modified: trunk/zypper/src/zypper-search.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.cc?rev=5984&r1=5983&r2=5984&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.cc (original) +++ trunk/zypper/src/zypper-search.cc Thu Jul 12 12:58:07 2007 @@ -26,9 +26,9 @@ } /** - * Initializes installation sources, creates search regex, caches installed + * Initializes repositories, creates search regex, caches installed * packages from RPM database, and populates ResPool with items from - * installation sources. + * repositories. */ ZyppSearch::ZyppSearch ( ZYpp::Ptr & zypp, @@ -40,7 +40,7 @@ cond_init_target(); // calls ZYpp::initializeTarget("/"); init_repos(); - // no sources warning + // no repos warning if (gData.repos.empty()) { cerr << _("No repositories configured. Please, add at least one" " repository using 'zypper addrepo' command before using search.") @@ -53,7 +53,7 @@ load_repo_resolvables(); // populates ResPool with resolvables from repos // cache identification strings of source resolvables (used to check for - // duplicates of target resolvables in sources - DuplicateFilter) + // duplicates of target resolvables in repos - DuplicateFilter) invokeOnEachSearched(not_c(ByInstalled()), functorRef(_idcache)); } Modified: trunk/zypper/src/zypper-search.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.h?rev=5984&r1=5983&r2=5984&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/zypper-search.h Thu Jul 12 12:58:07 2007 @@ -306,7 +306,7 @@ }; /** - * Filters target poolitems which have their counterpart among source + * Filters target poolitems which have their counterpart among repository * resolvables. */ struct DuplicateFilter { Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev=5984&r1=5983&r2=5984&view=diff ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Thu Jul 12 12:58:07 2007 @@ -44,7 +44,9 @@ if (do_refresh) { //! \todo progress reporting - cout_n << "Refreshing " << repo.alias() << endl; + cout_v << format( + _("Checking whether to refresh metadata for %s.")) % repo.alias() + << endl; manager.refreshMetadata(repo); } } @@ -138,7 +140,7 @@ catch ( const Exception &e ) { ZYPP_CAUGHT(e); - cerr << _("Error reading system sources:") << endl + cerr << _("Error reading repositories:") << endl << e.asUserString() << endl; exit(ZYPPER_EXIT_ERR_ZYPP); } @@ -160,7 +162,7 @@ { RepoInfo repo(*it); - // skip disabled sources + // skip disabled repos if (!repo.enabled()) { cout_v << format(_("Skipping disabled repository '%s'")) % repo.alias() Modified: trunk/zypper/src/zypper-sources.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.h?rev=5984&r1=5983&r2=5984&view=diff ============================================================================== --- trunk/zypper/src/zypper-sources.h (original) +++ trunk/zypper/src/zypper-sources.h Thu Jul 12 12:58:07 2007 @@ -59,11 +59,6 @@ */ void warn_if_zmd(); - -//! calls init_system_sources if not disabled by user (or non-root) -//void cond_init_system_sources(); // OLD -void init_system_sources(); // OLD - /** * Delte repository specified by \a alias. */ @@ -84,8 +79,6 @@ */ void modify_repo(const std::string & alias, const parsed_opts & copts); -//void include_source_by_url( const zypp::Url &url ); // OLD - #endif // Local Variables: // mode: c++ Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=5984&r1=5983&r2=5984&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Jul 12 12:58:07 2007 @@ -863,7 +863,7 @@ init_repos(); - //! \todo support temporary additional sources + //! \todo support temporary additional repos /* for ( std::list<Url>::const_iterator it = gSettings.additional_sources.begin(); it != gSettings.additional_sources.end(); ++it ) { @@ -873,12 +873,14 @@ if ( gData.repos.empty() ) { - cerr << _("Warning: No sources. Operating only with the installed resolvables. Nothing can be installed.") << endl; + cerr << _("Warning: No repositories defined." + " Operating only with the installed resolvables." + " Nothing can be installed.") << endl; } cond_init_target (); cond_load_resolvables(); - + for ( vector<string>::const_iterator it = arguments.begin(); it != arguments.end(); ++it ) { if (command == ZypperCommand::INSTALL) { mark_for_install(kind, *it); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org