diff options
| author | Dan McGee <dan@archlinux.org> | 2007-08-24 04:26:55 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-08-24 04:26:55 +0200 |
| commit | 5c9eec5570c145c07660bd2ba207b579eda0f26c (patch) | |
| tree | d8fb3e1bb389f40469cec4210b4edb54c23f6f73 /lib/libalpm/cache.c | |
| parent | 2798ebbb6286b7a0acc4b5ff10906c1a92ecc946 (diff) | |
| download | pacman-5c9eec5570c145c07660bd2ba207b579eda0f26c.tar.gz pacman-5c9eec5570c145c07660bd2ba207b579eda0f26c.tar.xz | |
libalpm: add newlines to all strings passed to log callback
This allows us to remove the hack in the frontend where we added a newline
to everything coming out of the pm_printf functions, and instead let the
developer put newlines where they want them. This should be the last hangover
of that auto-newline stuff.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/cache.c')
| -rw-r--r-- | lib/libalpm/cache.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index 10021634..ef3c71bd 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -54,12 +54,12 @@ int _alpm_db_load_pkgcache(pmdb_t *db) _alpm_db_free_pkgcache(db); - _alpm_log(PM_LOG_DEBUG, "loading package cache for repository '%s'", + _alpm_log(PM_LOG_DEBUG, "loading package cache for repository '%s'\n", db->treename); _alpm_db_rewind(db); while((info = _alpm_db_scan(db, NULL)) != NULL) { - _alpm_log(PM_LOG_FUNCTION, _("adding '%s' to package cache for db '%s'"), + _alpm_log(PM_LOG_FUNCTION, _("adding '%s' to package cache for db '%s'\n"), alpm_pkg_get_name(info), db->treename); info->origin = PKG_FROM_CACHE; info->origin_data.db = db; @@ -80,7 +80,7 @@ void _alpm_db_free_pkgcache(pmdb_t *db) return; } - _alpm_log(PM_LOG_DEBUG, "freeing package cache for repository '%s'", + _alpm_log(PM_LOG_DEBUG, "freeing package cache for repository '%s'\n", db->treename); alpm_list_t *tmp; @@ -109,7 +109,7 @@ alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db) /* hmmm, still NULL ?*/ if(!db->pkgcache) { - _alpm_log(PM_LOG_DEBUG, "error: pkgcache is NULL for db '%s'", db->treename); + _alpm_log(PM_LOG_DEBUG, "error: pkgcache is NULL for db '%s'\n", db->treename); } return(db->pkgcache); @@ -129,7 +129,7 @@ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg) if(newpkg == NULL) { return(-1); } - _alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache", + _alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n", alpm_pkg_get_name(newpkg), db->treename); db->pkgcache = alpm_list_add_sorted(db->pkgcache, newpkg, _alpm_pkg_cmp); @@ -149,14 +149,14 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg) return(-1); } - _alpm_log(PM_LOG_DEBUG, "removing entry '%s' from '%s' cache", + _alpm_log(PM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n", alpm_pkg_get_name(pkg), db->treename); db->pkgcache = alpm_list_remove(db->pkgcache, pkg, _alpm_pkg_cmp, &vdata); data = vdata; if(data == NULL) { /* package not found */ - _alpm_log(PM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found", + _alpm_log(PM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n", alpm_pkg_get_name(pkg), db->treename); return(-1); } @@ -178,7 +178,7 @@ pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target) alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db); if(!pkgcache) { - _alpm_log(PM_LOG_DEBUG, "error: failed to get '%s' from NULL pkgcache", + _alpm_log(PM_LOG_DEBUG, "error: failed to get '%s' from NULL pkgcache\n", target); return(NULL); } @@ -202,7 +202,7 @@ int _alpm_db_load_grpcache(pmdb_t *db) _alpm_db_load_pkgcache(db); } - _alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'", + _alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'\n", db->treename); for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) { |