Author: jreidinger Date: Fri Mar 7 15:32:56 2008 New Revision: 9051 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9051&view=rev Log: remove useless functions and catching exceptions (because functions is called with allready finded repository). Modified: trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-repos.h Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=9051&r1=9050&r2=9051&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Fri Mar 7 15:32:56 2008 @@ -1267,59 +1267,19 @@ // ---------------------------------------------------------------------------- -bool remove_repo(Zypper & zypper, const RepoInfo & repoinfo) +void remove_repo(Zypper & zypper, const RepoInfo & repoinfo) { RepoManager manager(zypper.globalOpts().rm_options); bool found = true; - try - { - manager.removeRepository(repoinfo); - zypper.out().info(boost::str( - format(_("Repository '%s' has been removed.")) % repoinfo.name())); - MIL << format("Repository '%s' has been removed.") % repoinfo.name() << endl; - } - catch (const repo::RepoNotFoundException & ex) - { - found = false; - } - - return found; + manager.removeRepository(repoinfo); + zypper.out().info(boost::str( + format(_("Repository '%s' has been removed.")) % repoinfo.name())); + MIL << format("Repository '%s' has been removed.") % repoinfo.name() << endl; } // ---------------------------------------------------------------------------- -bool remove_repo(Zypper & zypper, const std::string &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 false; -} - -bool remove_repo(Zypper & zypper, const Url & url, const url::ViewOption & urlview) -{ - RepoManager manager(zypper.globalOpts().rm_options); - bool found = true; - try - { - RepoInfo info = manager.getRepositoryInfo(url, urlview); - found = remove_repo(zypper, info); - } - catch (const repo::RepoNotFoundException & ex) - { - found = false; - } - - return found; -} - -// ---------------------------------------------------------------------------- - void rename_repo(Zypper & zypper, const std::string & alias, const std::string & newalias) { @@ -1335,10 +1295,6 @@ _("Repository '%s' renamed to '%s'.")) % alias % repo.alias())); MIL << format("Repository '%s' renamed to '%s'") % alias % repo.alias() << endl; } - catch (const RepoNotFoundException & ex) - { - MIL << "This should not happen. Already finded repo is not found" << endl; - } catch (const RepoAlreadyExistsException & ex) { zypper.out().error(boost::str(format( @@ -1419,12 +1375,6 @@ _("Repository %s has been sucessfully modified.")) % alias)); MIL << format("Repository %s modified:") % alias << repo << endl; } - catch (const RepoNotFoundException & ex) - { - zypper.out().error( - boost::str(format(_("Repository %s not found.")) % alias)); - ERR << "Repo " << alias << " not found" << endl; - } catch (const Exception & ex) { zypper.out().error(ex, Modified: trunk/zypper/src/zypper-repos.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.h?rev=9051&r1=9050&r2=9051&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.h (original) +++ trunk/zypper/src/zypper-repos.h Fri Mar 7 15:32:56 2008 @@ -87,12 +87,7 @@ /** * 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); +void remove_repo(Zypper & zypper, const zypp::RepoInfo & repoinfo); /** * Rename repository specified by \a alias to \a newalias. -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org