Author: jkupec Date: Mon Jan 7 12:03:25 2008 New Revision: 8216 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8216&view=rev Log: - show the repo name instead of alias upon removal Modified: trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-repos.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=8216&r1=8215&r2=8216&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Mon Jan 7 12:03:25 2008 @@ -948,15 +948,15 @@ // ---------------------------------------------------------------------------- -static bool do_remove_repo(Zypper & zypper, const RepoInfo & repoinfo) +bool remove_repo(Zypper & zypper, const RepoInfo & repoinfo) { RepoManager manager(zypper.globalOpts().rm_options); bool found = true; try { manager.removeRepository(repoinfo); - cout << format(_("Repository %s has been removed.")) % repoinfo.name() << endl; - MIL << format("Repository %s has been removed.") % repoinfo.name() << endl; + cout << format(_("Repository '%s' has been removed.")) % repoinfo.name() << endl; + MIL << format("Repository '%s' has been removed.") % repoinfo.name() << endl; } catch (const repo::RepoNotFoundException & ex) { @@ -971,10 +971,14 @@ bool remove_repo(Zypper & zypper, const std::string &alias ) { - RepoInfo info; - info.setAlias(alias); + list<RepoInfo> repos = + RepoManager(zypper.globalOpts().rm_options).knownRepositories(); + for (list<RepoInfo>::const_iterator it = repos.begin(); + it != repos.end(); ++it) + if (it->alias() == alias) + return remove_repo(zypper, *it); - return do_remove_repo(zypper, info); + return false; } bool remove_repo(Zypper & zypper, const Url & url, const url::ViewOption & urlview) @@ -984,7 +988,7 @@ try { RepoInfo info = manager.getRepositoryInfo(url, urlview); - found = do_remove_repo(zypper, info); + found = remove_repo(zypper, info); } catch (const repo::RepoNotFoundException & ex) { Modified: trunk/zypper/src/zypper-repos.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.h?rev=8216&r1=8215&r2=8216&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.h (original) +++ trunk/zypper/src/zypper-repos.h Mon Jan 7 12:03:25 2008 @@ -64,13 +64,15 @@ void add_repo(Zypper & zypper, zypp::RepoInfo & repo); /** - * Delte repository specified by \a alias. + * Remove repository specified by \a alias. */ bool remove_repo(Zypper & zypper, const std::string &alias ); bool remove_repo(Zypper & zypper, const zypp::Url & url, const zypp::url::ViewOption & urlview); +bool remove_repo(Zypper & zypper, const zypp::RepoInfo & repoinfo); + /** * Rename repository specified by \a alias to \a newalias. */ Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8216&r1=8215&r2=8216&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon Jan 7 12:03:25 2008 @@ -2171,7 +2171,7 @@ // remove the additional repositories specified by --plus-repo for (list<RepoInfo>::const_iterator it = gData.additional_repos.begin(); it != gData.additional_repos.end(); ++it) - remove_repo(*this, it->alias()); + remove_repo(*this, *it); } // Local Variables: -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org