Author: jkupec Date: Wed Aug 1 14:33:18 2007 New Revision: 6361 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6361&view=rev Log: - better error handling in init_repos() Modified: trunk/zypper/src/zypper-sources.cc Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev=6361&r1=6360&r2=6361&view=diff ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Wed Aug 1 14:33:18 2007 @@ -57,11 +57,12 @@ else gData.repos = manager.knownRepositories(); + for (std::list<RepoInfo>::iterator it = gData.repos.begin(); it != gData.repos.end(); ++it) { RepoInfo repo(*it); - MIL << "initializing " << repo.alias() << endl; + MIL << "checking if to refresh " << repo.alias() << endl; //! \todo honor command line options/commands bool do_refresh = repo.enabled() && repo.autorefresh(); @@ -73,21 +74,46 @@ << endl; MIL << "calling refresh for " << repo.alias() << endl; - try { manager.refreshMetadata(repo); } - catch (const RepoException & ex) + // handle root user differently + if (geteuid() == 0) { - cerr << format(_("Repository %s is invalid.")) % repo.alias() << endl; - cerr_v << _("Reason: ") << ex.asUserString() << endl; - ERR << repo.alias() << " is invalid, disabling it" << endl; - it->setEnabled(false); + try { manager.refreshMetadata(repo, RepoManager::RefreshIfNeeded); } + //! \todo handle the rest of special exceptions + catch (const RepoException & ex) + { + cerr << format(_("Repository '%s' is invalid.")) % repo.alias() << endl; + cerr_v << _("Reason: ") << ex.asUserString() << endl; + ERR << repo.alias() << " is invalid, disabling it" << endl; + it->setEnabled(false); + } + catch (const Exception & ex) + { + cerr << format(_("Error while refreshing repository %s:")) % repo.alias() + << endl; + cerr << ex.asUserString() << endl; + ERR << "Error while refreshing " << repo.alias() << ", disabling it" << endl; + it->setEnabled(false); + } } - catch (const Exception & ex) + // non-root user + else { - cerr << format(_("Error while refreshing repository %s:")) % repo.alias() - << endl; - cerr << ex.asUserString() << endl; - ERR << "Error while refreshing " << repo.alias() << ", disabling it" << endl; - it->setEnabled(false); + try { manager.refreshMetadata(repo, RepoManager::RefreshIfNeeded); } + // any exception thrown means zypp attempted to refresh the repo + // i.e. it is out-of-date. Thus, just display refresh hint for non-root + // user + catch (const Exception & ex) + { + cout << format(_( + "Repository '%s' is out-of-date. You can run 'zypper refresh'" + " as root to update it.")) % repo.alias() + << endl; + + string nonroot = + "We're running as non-root, skipping refresh of " + repo.alias(); + MIL << nonroot << endl; + cout_vv << nonroot << endl; + } } } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org