diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-07 20:15:43 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-09 21:24:45 +0200 |
| commit | 17a6ac567502975d3a98a34ed58d79c05eb7b8d1 (patch) | |
| tree | fb764ae26aac86fd43daa79cb0047cc82f8039e9 /src/pacman/util.c | |
| parent | 7968d30510de5a6031af39da498be5c821290b82 (diff) | |
| download | pacman-17a6ac567502975d3a98a34ed58d79c05eb7b8d1.tar.gz pacman-17a6ac567502975d3a98a34ed58d79c05eb7b8d1.tar.xz | |
Require handle argument to all alpm_option_(get|set)_*() methods
This requires a lot of line changes, but not many functional changes as
more often than not our handle variable is already available in some
fashion.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/util.c')
| -rw-r--r-- | src/pacman/util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c index 3233f5f7..8d174e94 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -64,7 +64,8 @@ int trans_init(pmtransflag_t flags) alpm_strerrorlast()); if(pm_errno == PM_ERR_HANDLE_LOCK) { fprintf(stderr, _(" if you're sure a package manager is not already\n" - " running, you can remove %s\n"), alpm_option_get_lockfile()); + " running, you can remove %s\n"), + alpm_option_get_lockfile(config->handle)); } else if(pm_errno == PM_ERR_DB_VERSION) { fprintf(stderr, _(" try running pacman-db-upgrade\n")); @@ -654,7 +655,7 @@ static alpm_list_t *create_verbose_row(pmpkg_t *pkg, int install) double size; const char *label; alpm_list_t *ret = NULL; - pmdb_t *ldb = alpm_option_get_localdb(); + pmdb_t *ldb = alpm_option_get_localdb(config->handle); /* a row consists of the package name, */ pm_asprintf(&str, "%s", alpm_pkg_get_name(pkg)); @@ -688,7 +689,7 @@ void display_targets(const alpm_list_t *pkgs, int install) const alpm_list_t *i; off_t isize = 0, rsize = 0, dlsize = 0; alpm_list_t *j, *lp, *header = NULL, *targets = NULL; - pmdb_t *db_local = alpm_option_get_localdb(); + pmdb_t *db_local = alpm_option_get_localdb(config->handle); if(!pkgs) { return; |