Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-08-01 14:19:50 -0700
committerAllan McRae <allan@archlinux.org>2014-08-04 14:23:58 +1000
commit03b9bf08ac3b1e3f2c3b950ce995654af2c40503 (patch)
treeb29640b65be43edc0755bfb895140a5e7dbd0a6c
parent7f1360b44089d69bae9a793741c0292fe91e32e4 (diff)
handle_unlock: log lock removal failure
Rather than have individual callers log failure, just do it directly in _alpm_handle_unlock. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/be_sync.c6
-rw-r--r--lib/libalpm/handle.c4
-rw-r--r--lib/libalpm/trans.c7
3 files changed, 6 insertions, 11 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index df0b1b73..4b67f429 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -291,11 +291,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
}
cleanup:
-
- if(_alpm_handle_unlock(handle)) {
- _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"),
- handle->lockfile);
- }
+ _alpm_handle_unlock(handle);
free(syncpath);
umask(oldmask);
return ret;
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index b218a689..234fc4d0 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -126,6 +126,10 @@ int _alpm_handle_unlock(alpm_handle_t *handle)
handle->lockfd = -1;
if(unlink(handle->lockfile) && errno != ENOENT) {
+ _alpm_log(handle, ALPM_LOG_WARNING,
+ _("could not remove lock file %s\n"), handle->lockfile);
+ alpm_logaction(handle, ALPM_CALLER_PREFIX,
+ "warning: could not remove lock file %s\n", handle->lockfile);
return -1;
}
return 0;
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index e5328c53..68f6633d 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -231,12 +231,7 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle)
/* unlock db */
if(!nolock_flag) {
- if(_alpm_handle_unlock(handle)) {
- _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"),
- handle->lockfile);
- alpm_logaction(handle, ALPM_CALLER_PREFIX,
- "warning: could not remove lock file %s\n", handle->lockfile);
- }
+ _alpm_handle_unlock(handle);
}
return 0;