diff options
| author | Dan McGee <dan@archlinux.org> | 2012-04-08 21:55:30 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-08 21:55:30 -0500 |
| commit | d158dde30c378acc8e88d5208aa837f92331af9e (patch) | |
| tree | b99456c7b765becdb5bab3869af5a2e512026562 /src/pacman/conf.c | |
| parent | 31091963edaa505d00642aecb9950ce087a40b73 (diff) | |
| parent | b729ed01093312cef7ce48d07b13e225b25446db (diff) | |
Merge remote-tracking branch 'dave/buildsys'
Oh god, what are we thinking thinking merging this. Hopefully this works with
only a few follow-up patches necessary.
Diffstat (limited to 'src/pacman/conf.c')
| -rw-r--r-- | src/pacman/conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 4c3d063b..2632d18f 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -202,14 +202,14 @@ static int download_with_xfercommand(const char *url, const char *localpath, cleanup: /* restore the old cwd if we have it */ if(cwdfd >= 0) { - int ret; + int close_ret; if(fchdir(cwdfd) != 0) { pm_printf(ALPM_LOG_ERROR, _("could not restore working directory (%s)\n"), strerror(errno)); } do { - ret = close(cwdfd); - } while(ret == -1 && errno == EINTR); + close_ret = close(cwdfd); + } while(close_ret == -1 && errno == EINTR); } if(ret == -1) { |