[zypp-commit] r6056 - in /trunk/zypper/src: zypper-sources.cc zypper-sources.h zypper.cc

Author: jkupec Date: Wed Jul 18 12:27:08 2007 New Revision: 6056 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6056&view=rev Log: - remove repository by URL reimplemented - --loose-auth and --loose-query added for removerepo command - fixes bug 292362 Modified: trunk/zypper/src/zypper-sources.cc trunk/zypper/src/zypper-sources.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev=6056&r1=6055&r2=6056&view=diff ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Wed Jul 18 12:27:08 2007 @@ -405,14 +405,51 @@ return false; } +static bool do_remove_repo(const RepoInfo & repoinfo) +{ + RepoManager manager; + bool found = true; + try + { + manager.removeRepository(repoinfo); + cout << format(_("Repository %s has been removed.")) % repoinfo.alias() << endl; + MIL << format("Repository %s has been removed.") % repoinfo.alias() << endl; + } + catch (const repo::RepoNotFoundException & ex) + { + found = false; + } + + return found; +} + + // ---------------------------------------------------------------------------- -void remove_repo( const std::string &alias ) +bool remove_repo( const std::string &alias ) { RepoManager manager; RepoInfo info; info.setAlias(alias); - manager.removeRepository(info); + + return do_remove_repo(info); +} + +bool remove_repo(const Url & url, const url::ViewOption & urlview) +{ + RepoManager manager; + bool found = true; + try + { + RepoInfo info = manager.getRepositoryInfo(url, urlview); + found = do_remove_repo(info); + } + catch (const repo::RepoNotFoundException & ex) + { + found = false; + } + + return found; } // ---------------------------------------------------------------------------- @@ -427,7 +464,7 @@ repo.setAlias(newalias); manager.modifyRepository(alias, repo); - cout_n << format(_("Repository %s renamed to %s")) % alias % repo.alias() << endl; + cout << format(_("Repository %s renamed to %s")) % alias % repo.alias() << endl; MIL << format("Repository %s renamed to %s") % alias % repo.alias() << endl; } catch (const RepoNotFoundException & ex) Modified: trunk/zypper/src/zypper-sources.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.h?rev=6056&r1=6055&r2=6056&view=diff ============================================================================== --- trunk/zypper/src/zypper-sources.h (original) +++ trunk/zypper/src/zypper-sources.h Wed Jul 18 12:27:08 2007 @@ -62,8 +62,9 @@ /** * Delte repository specified by \a alias. */ -void remove_repo( const std::string &alias ); +bool remove_repo( const std::string &alias ); +bool remove_repo( const zypp::Url & url, const zypp::url::ViewOption & urlview ); /** * 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=6056&r1=6055&r2=6056&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Wed Jul 18 12:27:08 2007 @@ -22,6 +22,7 @@ #include #include +#include #include "zypper.h" #include "zypper-sources.h" @@ -80,7 +81,7 @@ } catch ( const Exception & excpt_r ) { ZYPP_CAUGHT( excpt_r ); - cerr << _("URL is invalid.") << endl; + cerr << _("Given URL is invalid.") << endl; cerr << excpt_r.asUserString() << endl; } return u; @@ -331,15 +332,19 @@ else if (command == ZypperCommand::REMOVE_REPO) { static struct option service_delete_options[] = { {"help", no_argument, 0, 'h'}, + {"loose-auth", no_argument, 0, 0}, + {"loose-query", no_argument, 0, 0}, {0, 0, 0, 0} }; specific_options = service_delete_options; specific_help = _( - "service-delete [options] <alias>\n" + "removerepo (rr) [options] \n" "\n" - "Remove service (installation source) from the system." + "Remove repository specified by alias or URL." "\n" - "This command has no additional options.\n" + " Command options:\n" + "\t--loose-auth\tIgnore user authentication data in the URL\n" + "\t--loose-query\tIgnore query string in the URL\n" ); } else if (command == ZypperCommand::RENAME_REPO) { @@ -722,15 +727,46 @@ } warn_if_zmd (); - try { - // also stores it - remove_repo(arguments[0]); - } + + bool found = remove_repo(arguments[0]); + if (found) + return ZYPPER_EXIT_OK; + + MIL << "Repository not found by alias, trying delete by URL" << endl; + cout_v << _("Repository not found by alias, trying delete by URL...") << endl; + + Url url; + try { url = Url (arguments[0]); } catch ( const Exception & excpt_r ) { - ZYPP_CAUGHT (excpt_r); - cerr << excpt_r.asUserString() << endl; - return ZYPPER_EXIT_ERR_ZYPP; + ZYPP_CAUGHT( excpt_r ); + cerr_v << _("Given URL is invalid.") << endl; + cerr_v << excpt_r.asUserString() << endl; + } + + if (url.isValid()) + { + url::ViewOption urlview = url::ViewOption::DEFAULTS + url::ViewOption::WITH_PASSWORD; + + if (copts.count("loose-auth")) + { + urlview = urlview + - url::ViewOptions::WITH_PASSWORD + - url::ViewOptions::WITH_USERNAME; + } + + if (copts.count("loose-query")) + urlview = urlview - url::ViewOptions::WITH_QUERY_STR; + + found = remove_repo(url, urlview); + } + else + found = false; + + if (!found) + { + MIL << "Repository not found by given alias or URL." << endl; + cerr << _("Repository not found by given alias or URL.") << endl; } return ZYPPER_EXIT_OK; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org