emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: if local repodata archive is incomplete, remove it.

Browse Source
This commit is contained in:
Juan RP 2014-11-29 08:44:21 +01:00
parent a71e428610
commit 4479bff03e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/repo.c
View File

@ -107,7 +107,7 @@ repo_get_dict(struct xbps_repo *repo)
} }
static bool static bool
repo_open_local(struct xbps_repo *repo, bool lock) repo_open_local(struct xbps_repo *repo, const char *repofile, bool lock)
{ {
struct stat st; struct stat st;
int rv = 0; int rv = 0;
@ -118,13 +118,14 @@ repo_open_local(struct xbps_repo *repo, bool lock)
*/ */
if (lock && lockf(repo->fd, F_LOCK, 0) == -1) { if (lock && lockf(repo->fd, F_LOCK, 0) == -1) {
rv = errno; rv = errno;
xbps_dbg_printf(repo->xhp, "[repo] failed to lock %s: %s\n", repo->uri, strerror(rv)); xbps_dbg_printf(repo->xhp, "[repo] failed to lock %s: %s\n",
repofile, strerror(rv));
return false; return false;
} }
if (fstat(repo->fd, &st) == -1) { if (fstat(repo->fd, &st) == -1) {
rv = errno; rv = errno;
xbps_dbg_printf(repo->xhp, "[repo] `%s' fstat repodata %s\n", xbps_dbg_printf(repo->xhp, "[repo] `%s' fstat repodata %s\n",
repo->uri, strerror(rv)); repofile, strerror(rv));
return false; return false;
} }
@ -136,14 +137,15 @@ repo_open_local(struct xbps_repo *repo, bool lock)
rv = archive_errno(repo->ar); rv = archive_errno(repo->ar);
xbps_dbg_printf(repo->xhp, xbps_dbg_printf(repo->xhp,
"[repo] `%s' failed to open repodata archive %s\n", "[repo] `%s' failed to open repodata archive %s\n",
repo->uri, strerror(rv)); repofile, strerror(rv));
return false; return false;
} }
if ((repo->idx = repo_get_dict(repo)) == NULL) { if ((repo->idx = repo_get_dict(repo)) == NULL) {
rv = archive_errno(repo->ar); rv = archive_errno(repo->ar);
xbps_dbg_printf(repo->xhp, xbps_dbg_printf(repo->xhp, "[repo] `%s' failed to internalize "
"[repo] `%s' failed to internalize index on archive: %s\n", " index on archive, removing file.\n", repofile);
repo->uri, strerror(rv)); /* broken archive, remove it */
(void)unlink(repofile);
return false; return false;
} }
repo->idxmeta = repo_get_dict(repo); repo->idxmeta = repo_get_dict(repo);
@ -228,8 +230,10 @@ xbps_repo_open(struct xbps_handle *xhp, const char *url, bool lock)
repofile, strerror(rv)); repofile, strerror(rv));
goto out; goto out;
} }
if (repo_open_local(repo, lock)) if (repo_open_local(repo, repofile, lock)) {
free(repofile);
return repo; return repo;
}
out: out:
if (repo->ar) if (repo->ar)