Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/trans.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-10-12 21:36:45 -0500
committerDan McGee <dan@archlinux.org>2008-10-12 21:36:45 -0500
commitfa02a71abd62fc8b45e92ce1652b5d98174a6dca (patch)
tree44880adf216b6a634e90e76428b265e02df33b58 /lib/libalpm/trans.c
parent91a013a8791b73daf4d17b2d52c8dfaf12887cc6 (diff)
parent30851a24ff68b00898565a1144926d83c623e6bf (diff)
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/trans.c')
-rw-r--r--lib/libalpm/trans.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index d2336454..73ae822e 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -30,7 +30,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/statvfs.h>
-#include <unistd.h>
#include <errno.h>
/* libalpm */
@@ -205,7 +204,7 @@ int SYMEXPORT alpm_trans_release()
/* unlock db */
if(handle->lckfd != -1) {
- close(handle->lckfd);
+ while(close(handle->lckfd) == -1 && errno == EINTR);
handle->lckfd = -1;
}
if(_alpm_lckrm()) {
@@ -567,7 +566,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
/* this code runs for the parent only (wait on the child) */
pid_t retpid;
int status;
- retpid = waitpid(pid, &status, 0);
+ while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR);
if(retpid == -1) {
_alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"),
strerror(errno));