diff options
author | Dan McGee <dan@archlinux.org> | 2012-02-21 00:00:26 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2012-02-21 00:00:26 +0100 |
commit | 3849c3aec130601572b9e06b42bb6af5938936de (patch) | |
tree | f298f227f4ff591390e55b4f02812f12312dd5c7 /src/pacman/util.c | |
parent | 326c6a8eed60bfd6aa0d653dad722d8637022d68 (diff) | |
parent | 78adb71f20ee335dff49e34d33f04817a40002b6 (diff) | |
download | pacman-3849c3aec130601572b9e06b42bb6af5938936de.tar.gz pacman-3849c3aec130601572b9e06b42bb6af5938936de.tar.xz |
Merge branch 'maint'
Conflicts:
contrib/pacsysclean.in
src/pacman/conf.h
Diffstat (limited to 'src/pacman/util.c')
-rw-r--r-- | src/pacman/util.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c index ccdc2079..1d9049ee 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -67,9 +67,13 @@ void trans_init_error(void) pm_printf(ALPM_LOG_ERROR, _("failed to init transaction (%s)\n"), alpm_strerror(err)); if(err == ALPM_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(config->handle)); + const char *lockfile = alpm_option_get_lockfile(config->handle); + pm_printf(ALPM_LOG_ERROR, _("could not lock database: %s\n"), + strerror(errno)); + if(access(lockfile, F_OK) == 0) { + fprintf(stderr, _(" if you're sure a package manager is not already\n" + " running, you can remove %s\n"), lockfile); + } } } |