Author: jkupec Date: Mon Sep 29 10:46:24 2008 New Revision: 11195 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11195&view=rev Log: - proper error message if the repository type can't be determined on refresh (bnc #389690) Modified: trunk/zypper/doc/TODO trunk/zypper/src/repos.cc Modified: trunk/zypper/doc/TODO URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/TODO?rev=11195&r1=11194&r2=11195&view=diff ============================================================================== --- trunk/zypper/doc/TODO (original) +++ trunk/zypper/doc/TODO Mon Sep 29 10:46:24 2008 @@ -5,8 +5,6 @@ - implement all rug commands (where it makes sense) - zypper [help] rug - add help texts for prompts -- show recommended and suggested in the summary -- report licenses of installed software NOT SCHEDULED @@ -37,3 +35,4 @@ User can upgrade such packages with 'zypper in foo' then. ? list packages newly added to repos since last update (might be easy once we have package history) +- show recommended and suggested in the summary Modified: trunk/zypper/src/repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/repos.cc?rev=11195&r1=11194&r2=11195&view=diff ============================================================================== --- trunk/zypper/src/repos.cc (original) +++ trunk/zypper/src/repos.cc Mon Sep 29 10:46:24 2008 @@ -80,7 +80,7 @@ _("Checking whether to refresh metadata for %s")) % repo.name()), Out::HIGH); for(RepoInfo::urls_const_iterator it = repo.baseUrlsBegin(); - it != repo.baseUrlsEnd(); ++it) + it != repo.baseUrlsEnd();) { try { @@ -115,7 +115,11 @@ catch (const Exception & e) { ZYPP_CAUGHT(e); - ERR << *it << " doesn't look good. Trying another url." << endl; + Url badurl(*it); + if (++it == repo.baseUrlsEnd()) + ZYPP_RETHROW(e); + ERR << badurl << " doesn't look good. Trying another url (" + << *it << ")." << endl; } } } @@ -262,7 +266,7 @@ { ZYPP_CAUGHT(e); zypper.out().error(e, - _("Error building the cache database:")); + _("Error building the cache:")); // log untranslated message ERR << "Error writing to cache db" << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org