Evolinx/packagekit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zypp: do not show empty messages or messages twice

Browse Source
This commit is contained in:
Stefan Haas 2008-11-19 11:39:59 +01:00
parent be429c95ec
commit b53d1b688b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backends/zypp/zypp-utils.cpp
View File

@ -928,7 +928,7 @@ zypp_refresh_cache (PkBackend *backend, gboolean force)
int i = 1;
int num_of_repos = repos.size ();
int percentage_increment = 100 / num_of_repos;
gchar *repo_messages = new gchar ();
gchar *repo_messages = NULL;
for (std::list <zypp::RepoInfo>::iterator it = repos.begin(); it != repos.end(); it++, i++) {
zypp::RepoInfo repo (*it);
@ -949,10 +949,15 @@ zypp_refresh_cache (PkBackend *backend, gboolean force)
zypp::RepoManager::RefreshForced :
zypp::RepoManager::RefreshIfNeeded);
} catch (const zypp::Exception &ex) {
repo_messages = g_strdup_printf ("%s%s: %s%s", repo_messages, repo.alias ().c_str (), ex.asUserString ().c_str (), "\n");
if (repo_messages == NULL) {
repo_messages = g_strdup_printf ("%s: %s%s", repo.alias ().c_str (), ex.asUserString ().c_str (), "\n");
}else{
repo_messages = g_strdup_printf ("%s%s: %s%s", repo_messages, repo.alias ().c_str (), ex.asUserString ().c_str (), "\n");
}
repo_messages = pk_strsafe (repo_messages);
if (repo_messages == NULL)
repo_messages = g_strdup ("A repository could not be refreshed");
continue;
}
try {
@ -965,7 +970,11 @@ zypp_refresh_cache (PkBackend *backend, gboolean force)
//} catch (const zypp::repo::RepoUnknownTypeException &ex) {
//} catch (const zypp::repo::RepoException &ex) {
} catch (const zypp::Exception &ex) {
repo_messages = g_strdup_printf ("%s%s: %s%s", repo_messages, repo.alias ().c_str (), ex.asUserString ().c_str (), "\n");
if (repo_messages == NULL) {
repo_messages = g_strdup_printf ("%s: %s%s", repo.alias ().c_str (), ex.asUserString ().c_str (), "\n");
}else{
repo_messages = g_strdup_printf ("%s%s: %s%s", repo_messages, repo.alias ().c_str (), ex.asUserString ().c_str (), "\n");
}
repo_messages = pk_strsafe (repo_messages);
if (repo_messages == NULL)
repo_messages = g_strdup ("A repository could not be refreshed");