diff options
| author | Dan McGee <dan@archlinux.org> | 2007-08-22 03:28:05 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-08-22 03:28:05 +0200 |
| commit | c22e381a8b86412b6c181446128affe32ab1d71e (patch) | |
| tree | 198d527a3d49819f57fabd8355673328969cc893 /lib/libalpm/conflict.c | |
| parent | 13525255dcd257e69d7c246bf32ceb263fbc31b9 (diff) | |
| download | pacman-c22e381a8b86412b6c181446128affe32ab1d71e.tar.gz pacman-c22e381a8b86412b6c181446128affe32ab1d71e.tar.xz | |
Post trial install changes, round one
A bunch of changes related to my first "real" install of pacman-git into
/usr/local and trying to use it.
* Shift some uses of free -> FREE in libalpm.
* Move stat and sanity checks of config paths into libalpm from the
config and argument parsing in pacman.c.
* Fix issue where dbpath still was not defined early enough due to its
requirement for being used in alpm_db_register. This should be rewritten
so it doesn't have this dependency, but this will work for now.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index c7e5eeb4..832db7cc 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -62,7 +62,7 @@ static int does_conflict(pmpkg_t *pkg1, const char *conflict, pmpkg_t *pkg2) _alpm_log(PM_LOG_DEBUG, "package %s conflicts with %s (by %s)", pkg1name, pkg2name, conflict); } - free(conf); + FREE(conf); return(match); } |