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

Update refs to pkg-index, which aren't true anymore.

Browse Source
This commit is contained in:
Juan RP 2011-11-10 09:21:17 +01:00
parent e46dd09127
commit de4504c248
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/xbps-bin/trans_cb.c
View File

@ -78,7 +78,7 @@ transaction_cb(struct xbps_transaction_cb_data *xtcd)
xtcd->pkgver, xtcd->binpkg_fname); xtcd->pkgver, xtcd->binpkg_fname);
break; break;
case XBPS_TRANS_STATE_REPOSYNC: case XBPS_TRANS_STATE_REPOSYNC:
printf("Synchronizing pkg-index for `%s' ...\n", printf("Synchronizing index for `%s' ...\n",
xtcd->repourl); xtcd->repourl);
break; break;
default: default:
@ -120,7 +120,7 @@ transaction_err_cb(struct xbps_transaction_cb_data *xtcd)
state_descr = "failed to register package"; state_descr = "failed to register package";
break; break;
case XBPS_TRANS_STATE_REPOSYNC: case XBPS_TRANS_STATE_REPOSYNC:
xbps_error_printf("Failed to sync pkg-index: %s\n", xbps_error_printf("Failed to sync index: %s\n",
res ? res : strerror(xtcd->err)); res ? res : strerror(xtcd->err));
return; return;
default: default:

4
bin/xbps-repo/index.c
View File

@ -37,7 +37,7 @@
#include "defs.h" #include "defs.h"
/* /*
* Removes stalled pkg entries in repository's pkg-index.plist file, if any * Removes stalled pkg entries in repository's index.plist file, if any
* binary package cannot be read (unavailable, not enough perms, etc). * binary package cannot be read (unavailable, not enough perms, etc).
*/ */
static int static int
@ -113,7 +113,7 @@ repoidx_getdict(const char *pkgdir)
int rv; int rv;
/* /*
* Remove entries in repositories pkg-index for unexistent * Remove entries in repositories index for unexistent
* packages, i.e dangling entries. * packages, i.e dangling entries.
*/ */
if ((rv = remove_missing_binpkg_entries(pkgdir)) != 0) if ((rv = remove_missing_binpkg_entries(pkgdir)) != 0)

2
include/xbps_api.h
View File

@ -1237,7 +1237,7 @@ struct repository_pool_index {
/** /**
* @var rpi_repod * @var rpi_repod
* *
* Internalized Proplib dictionary of the pkg-index plist file * Internalized Proplib dictionary of the index plist file
* associated with repository. * associated with repository.
*/ */
prop_dictionary_t rpi_repod; prop_dictionary_t rpi_repod;

2
lib/repository_pool.c
View File

@ -191,7 +191,7 @@ xbps_repository_pool_init(void)
free(plist); free(plist);
if (errno == ENOENT) { if (errno == ENOENT) {
errno = 0; errno = 0;
xbps_dbg_printf("[rpool] missing pkg-index.plist " xbps_dbg_printf("[rpool] missing index file "
"for '%s' repository.\n", repouri); "for '%s' repository.\n", repouri);
nmissing++; nmissing++;
continue; continue;

13
lib/repository_sync_index.c
View File

@ -129,7 +129,7 @@ xbps_repository_sync_pkg_index(const char *uri)
goto out; goto out;
} }
/* /*
* Remote repository pkg-index.plist full URL. * Remote repository index.plist full URL.
*/ */
rpidx = xbps_xasprintf("%s/%s", uri, XBPS_PKGINDEX); rpidx = xbps_xasprintf("%s/%s", uri, XBPS_PKGINDEX);
if (rpidx == NULL) { if (rpidx == NULL) {
@ -146,8 +146,7 @@ xbps_repository_sync_pkg_index(const char *uri)
goto out; goto out;
} }
/* /*
* Full path to repository directory to store the pkg-index.plist * Full path to repository directory to store the index.plist file.
* file.
*/ */
lrepodir = xbps_xasprintf("%s/%s/%s", lrepodir = xbps_xasprintf("%s/%s/%s",
prop_string_cstring_nocopy(xhp->rootdir), XBPS_META_PATH, uri_fixedp); prop_string_cstring_nocopy(xhp->rootdir), XBPS_META_PATH, uri_fixedp);
@ -156,7 +155,7 @@ xbps_repository_sync_pkg_index(const char *uri)
goto out; goto out;
} }
/* /*
* If directory exists probably the pkg-index.plist file * If directory exists probably the index.plist file
* was downloaded previously... * was downloaded previously...
*/ */
rv = stat(lrepodir, &st); rv = stat(lrepodir, &st);
@ -172,7 +171,7 @@ xbps_repository_sync_pkg_index(const char *uri)
xhp->xbps_transaction_cb(xhp->xtcd); xhp->xbps_transaction_cb(xhp->xtcd);
} }
/* /*
* Download pkg-index.plist file from repository. * Download index.plist file from repository.
*/ */
if (xbps_fetch_file(rpidx, fetch_outputdir, true, NULL) == -1) { if (xbps_fetch_file(rpidx, fetch_outputdir, true, NULL) == -1) {
if (xhp->xbps_transaction_err_cb) { if (xhp->xbps_transaction_err_cb) {
@ -193,7 +192,7 @@ xbps_repository_sync_pkg_index(const char *uri)
*/ */
tmpd = prop_dictionary_internalize_from_zfile(tmp_metafile); tmpd = prop_dictionary_internalize_from_zfile(tmp_metafile);
if (tmpd == NULL) { if (tmpd == NULL) {
xbps_error_printf("[rsyncidx] downloaded pkg-index.plist " xbps_error_printf("[rsyncidx] downloaded index.plist "
"file cannot be read! removing...\n"); "file cannot be read! removing...\n");
(void)unlink(tmp_metafile); (void)unlink(tmp_metafile);
rv = -1; rv = -1;
@ -207,7 +206,7 @@ xbps_repository_sync_pkg_index(const char *uri)
goto out; goto out;
} }
/* /*
* Create local repodir to store pkg-index.plist file. * Create local repodir to store index.plist file.
*/ */
if ((rv = xbps_mkpath(lrepodir, 0755)) == -1) { if ((rv = xbps_mkpath(lrepodir, 0755)) == -1) {
xbps_dbg_printf("[rsyncidx] failed to create repodir " xbps_dbg_printf("[rsyncidx] failed to create repodir "