moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-02-28 09:21:53 -05:00
Code Issues Releases Wiki Activity

* Fixed some error output for "-Sd" and "-Rsc" dealing with missing/ignored

Browse Source 
depends
* Added valgrind suppression file
This commit is contained in:
Aaron Griffin 2006-11-24 07:01:27 +00:00
parent 12fdce244c
commit 9918d43ab9
5 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libalpm/add.c
View File

@ -789,8 +789,8 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db)
FREELISTPTR(provides); FREELISTPTR(provides);
} }
if(depinfo == NULL) { if(depinfo == NULL) {
_alpm_log(PM_LOG_ERROR, _("could not find dependency '%s'"), depend.name); /* We'll let the front end deal with this case... it may be intentional */
/* wtf */ _alpm_log(PM_LOG_DEBUG, _("could not find dependency '%s'"), depend.name);
continue; continue;
} }
} }

3
lib/libalpm/deps.c
View File

@ -441,7 +441,8 @@ pmlist_t *_alpm_removedeps(pmdb_t *db, pmlist_t *targs)
/* package not found... look for a provisio instead */ /* package not found... look for a provisio instead */
k = _alpm_db_whatprovides(db, depend.name); k = _alpm_db_whatprovides(db, depend.name);
if(k == NULL) { if(k == NULL) {
_alpm_log(PM_LOG_WARNING, _("cannot find package \"%s\" or anything that provides it!"), depend.name); /* Not found, that's fine, carry on */
_alpm_log(PM_LOG_DEBUG, _("cannot find package \"%s\" or anything that provides it!"), depend.name);
continue; continue;
} }
dep = _alpm_db_get_pkgfromcache(db, ((pmpkg_t *)k->data)->name); dep = _alpm_db_get_pkgfromcache(db, ((pmpkg_t *)k->data)->name);

4
lib/libalpm/remove.c
View File

@ -319,8 +319,8 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
FREELISTPTR(provides); FREELISTPTR(provides);
} }
if(depinfo == NULL) { if(depinfo == NULL) {
_alpm_log(PM_LOG_ERROR, _("could not find dependency '%s'"), depend.name); /* dep not installed... that's fine, carry on */
/* wtf */ _alpm_log(PM_LOG_DEBUG, _("could not find dependency '%s' for removal"), depend.name);
continue; continue;
} }
} }

5
lib/libalpm/sync.c
View File

@ -215,8 +215,9 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, pmlist_t *dbs_sync
cmp = _alpm_versioncmp(local->version, spkg->version); cmp = _alpm_versioncmp(local->version, spkg->version);
if(cmp > 0 && !spkg->force) { if(cmp > 0 && !spkg->force) {
/* local version is newer */ /* local version is newer */
_alpm_log(PM_LOG_WARNING, _("%s-%s: local version is newer"), pmdb_t *db = spkg->data;
local->name, local->version); _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"),
local->name, local->version, db->treename, spkg->version);
} else if(cmp == 0) { } else if(cmp == 0) {
/* versions are identical */ /* versions are identical */
} else if(_alpm_list_is_strin(i->data, handle->ignorepkg)) { } else if(_alpm_list_is_strin(i->data, handle->ignorepkg)) {

30
valgrind.supp Normal file
View File

@ -0,0 +1,30 @@
# pacman suppressions for valgrind.
# right now, I really just care about those stupid dl_relocates
#
# Format of this file is:
# {
# name_of_suppression
# tool_name:supp_kind
# (optional extra info for some suppression types)
# caller0 name, or /name/of/so/file.so
# caller1 name, or ditto
# (optionally: caller2 name)
# (optionally: caller3 name)
# }
#
# For Memcheck, the supp_kinds are:
#
# Param Value1 Value2 Value4 Value8 Value16
# Free Addr1 Addr2 Addr4 Addr8 Addr16
# Cond (previously known as Value0)
#
# and the optional extra info is:
# if Param: name of system call param
# if Free: name of free-ing fn)
{
pacman-dlrelocate
Memcheck:Cond
fun:_dl_relocate_object
obj:*ld-2.5.so
}