Author: jkupec
Date: Fri Mar 7 15:12:18 2008
New Revision: 9049
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9049&view=rev
Log:
- minor corrections
Modified:
trunk/zypper/doc/zypper.8
trunk/zypper/src/zypper-repos.h
trunk/zypper/src/zypper.cc
Modified: trunk/zypper/doc/zypper.8
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=9049&r1=9048&r2=9049&view=diff
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Fri Mar 7 15:12:18 2008
@@ -337,8 +337,8 @@
NOTE: This command does not automatically refresh the newly added repositories. You have to use the \fBrefresh\fR command after finishing your modifications to repositories with \fB*repo\fR commands.
.TP
-.B removerepo (rr) [options]
-Delete repository specified by alias, number or URI.
+.B removerepo (rr) [options] ...
+Delete repositories specified by aliases, numbers or URIs.
.TP
\fI --loose-auth\fR
Ignore user authentication data in the URI
Modified: trunk/zypper/src/zypper-repos.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.h?rev=9049&r1=9048&r2=9049&view=diff
==============================================================================
--- trunk/zypper/src/zypper-repos.h (original)
+++ trunk/zypper/src/zypper-repos.h Fri Mar 7 15:12:18 2008
@@ -43,8 +43,8 @@
* Try match given string with any known repository.
*
* \param str string to match
- * \param repo pointer to fill with founded repository
- * \return success if respository is founded
+ * \param repo pointer to fill with found repository
+ * \return success if respository is found
*/
bool match_repo(Zypper & zypper, const std::string str, zypp::RepoInfo *repo);
Modified: trunk/zypper/src/zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9049&r1=9048&r2=9049&view=diff
==============================================================================
--- trunk/zypper/src/zypper.cc (original)
+++ trunk/zypper/src/zypper.cc Fri Mar 7 15:12:18 2008
@@ -1565,15 +1565,6 @@
return;
}
- // too many arguments
- //! \todo allow to specify multiple repos to delete
-/* else if (_arguments.size() > 1)
- {
- report_too_many_arguments(_command_help);
- setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS);
- return;
- } */
-
warn_if_zmd ();
//must store repository before remove to ensure correct match number
@@ -1586,8 +1577,8 @@
} else {
MIL << "Repository not found by given alias, number or URL." << endl;
out().error(boost::str(format(
- //TranslatorExplanation %s is string which not founded (can be url,
- //allias or number of repo)
+ //TranslatorExplanation %s is string which was not found (can be url,
+ //alias or the repo number)
_("Repository %s not found by alias, number or URL."))
% *it));
}
@@ -1596,8 +1587,8 @@
for (std::list<RepoInfo>::const_iterator it = repo_to_remove.begin();
it!=repo_to_remove.end();++it){
if (!remove_repo(*this,*it))
- MIL << "Repository is founded but cannot remove with root privilegies."
- << "Should not happen." << endl ;
+ ERR << "Repository '" << it->alias() << "' found but cound not be"
+ " removed with root privileges. Should not happen." << endl;
}
return;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
