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