summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-01-03 02:44:00 +0100
committerDan McGee <dan@archlinux.org>2012-01-03 02:44:00 +0100
commit6513b0ba591e44b4da75aa924046a34b8a269e9d (patch)
tree47935e981488774741dcc4d8dc71d4a5ecef69ba /lib
parent0b9cd9448c16dcf5e21ee8822698dbe908db520f (diff)
parentf1d9b0a74a9e38dc9e6153eac76f4c2482fd24aa (diff)
downloadpacman-6513b0ba591e44b4da75aa924046a34b8a269e9d.tar.gz
pacman-6513b0ba591e44b4da75aa924046a34b8a269e9d.tar.xz
Merge branch 'maint'
Conflicts: doc/Makefile.am
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/db.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 3e534358..6492a9b9 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -427,7 +427,7 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
for(k = alpm_pkg_get_provides(pkg); k; k = k->next) {
alpm_depend_t *provide = k->data;
if(regexec(&reg, provide->name, 0, 0, 0) == 0) {
- matched = k->data;
+ matched = provide->name;
break;
}
}
@@ -443,8 +443,8 @@ alpm_list_t *_alpm_db_search(alpm_db_t *db, const alpm_list_t *needles)
}
if(matched != NULL) {
- _alpm_log(db->handle, ALPM_LOG_DEBUG, " search target '%s' matched '%s'\n",
- targ, matched);
+ _alpm_log(db->handle, ALPM_LOG_DEBUG,
+ "search target '%s' matched '%s'\n", targ, matched);
ret = alpm_list_add(ret, pkg);
}
}