From 5c1fc718f33853492f418163b7d690e91e40ce59 Mon Sep 17 00:00:00 2001 From: Jan Kupec Date: Thu, 12 Jul 2007 10:58:07 +0000 Subject: [PATCH] - s/source/repository in zypper texts, help page will follow --- src/zypp-checkpatches.cc | 12 ++++++------ src/zypper-misc.cc | 6 +++--- src/zypper-search.cc | 8 ++++---- src/zypper-search.h | 2 +- src/zypper-sources.cc | 8 +++++--- src/zypper-sources.h | 7 ------- src/zypper.cc | 8 +++++--- 7 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/zypp-checkpatches.cc b/src/zypp-checkpatches.cc index 5009781..8a55c6c 100644 --- a/src/zypp-checkpatches.cc +++ b/src/zypp-checkpatches.cc @@ -154,18 +154,18 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) 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 @@ int main(int argc, char **argv) { // 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 @@ int main(int argc, char **argv) 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); diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc index 61e7926..d65bd9d 100644 --- a/src/zypper-misc.cc +++ b/src/zypper-misc.cc @@ -879,12 +879,12 @@ int solve_and_commit (bool non_interactive) { 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 diff --git a/src/zypper-search.cc b/src/zypper-search.cc index 666ce5a..1fe9f87 100644 --- a/src/zypper-search.cc +++ b/src/zypper-search.cc @@ -26,9 +26,9 @@ void ZyppSearchOptions::resolveConflicts() { } /** - * 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 @@ ZyppSearch::ZyppSearch ( 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 @@ ZyppSearch::ZyppSearch ( 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)); } diff --git a/src/zypper-search.h b/src/zypper-search.h index f26a5a0..a59b856 100644 --- a/src/zypper-search.h +++ b/src/zypper-search.h @@ -306,7 +306,7 @@ struct Match { }; /** - * Filters target poolitems which have their counterpart among source + * Filters target poolitems which have their counterpart among repository * resolvables. */ struct DuplicateFilter { diff --git a/src/zypper-sources.cc b/src/zypper-sources.cc index 2568ab7..e9d1271 100644 --- a/src/zypper-sources.cc +++ b/src/zypper-sources.cc @@ -44,7 +44,9 @@ static void do_init_repos() 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 @@ void list_repos() 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 @@ void refresh_repos() { RepoInfo repo(*it); - // skip disabled sources + // skip disabled repos if (!repo.enabled()) { cout_v << format(_("Skipping disabled repository '%s'")) % repo.alias() diff --git a/src/zypper-sources.h b/src/zypper-sources.h index cb8a71b..8db1341 100644 --- a/src/zypper-sources.h +++ b/src/zypper-sources.h @@ -59,11 +59,6 @@ int add_repo_from_file(const std::string & repo_file_url, */ 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 rename_repo(const std::string & alias, const std::string & newalias); */ 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++ diff --git a/src/zypper.cc b/src/zypper.cc index f8fcefc..fda4cee 100644 --- a/src/zypper.cc +++ b/src/zypper.cc @@ -863,7 +863,7 @@ int one_command(const ZypperCommand & command, int argc, char **argv) init_repos(); - //! \todo support temporary additional sources + //! \todo support temporary additional repos /* for ( std::list::const_iterator it = gSettings.additional_sources.begin(); it != gSettings.additional_sources.end(); ++it ) { @@ -873,12 +873,14 @@ int one_command(const ZypperCommand & command, int argc, char **argv) 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::const_iterator it = arguments.begin(); it != arguments.end(); ++it ) { if (command == ZypperCommand::INSTALL) { mark_for_install(kind, *it); -- 2.7.4