From 98e1687ef59c07859eb016ea390f1ef3eb6e11f6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 16 Sep 2013 09:09:56 +0200 Subject: [PATCH] Re-add all pkg metadata objects to the repository index. --- NEWS | 4 ++++ bin/xbps-query/show-info-files.c | 20 +++++--------------- bin/xbps-rindex/index-add.c | 11 ----------- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/NEWS b/NEWS index 529177a1..d4c89027 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ xbps-0.26 (???): + * Re-added all metadata package objects to the repository index, this avoids + remote connections when querying packages from remote repositories. This also + speeds up 'xbps-src' when using remote repositories as well. + * A C99 compiler is now required due to the use of for loop initializers. * Fixed #14 from github: "Removing recursively does not respect manual installation diff --git a/bin/xbps-query/show-info-files.c b/bin/xbps-query/show-info-files.c index 62e2e566..0cc34347 100644 --- a/bin/xbps-query/show-info-files.c +++ b/bin/xbps-query/show-info-files.c @@ -289,26 +289,16 @@ repo_show_pkg_info(struct xbps_handle *xhp, const char *pattern, const char *option) { - xbps_dictionary_t ipkgd, bpkgd; + xbps_dictionary_t pkgd; - if (((ipkgd = xbps_rpool_get_pkg(xhp, pattern)) == NULL) && - ((ipkgd = xbps_rpool_get_virtualpkg(xhp, pattern)) == NULL)) + if (((pkgd = xbps_rpool_get_pkg(xhp, pattern)) == NULL) && + ((pkgd = xbps_rpool_get_virtualpkg(xhp, pattern)) == NULL)) return errno; - if ((bpkgd = xbps_repo_get_pkg_plist(xhp, ipkgd, "./props.plist")) == NULL) - return errno; - - xbps_dictionary_set(bpkgd, "repository", - xbps_dictionary_get(ipkgd, "repository")); - xbps_dictionary_set(bpkgd, "filename-sha256", - xbps_dictionary_get(ipkgd, "filename-sha256")); - xbps_dictionary_set(bpkgd, "filename-size", - xbps_dictionary_get(ipkgd, "filename-size")); - if (option) - show_pkg_info_one(bpkgd, option); + show_pkg_info_one(pkgd, option); else - show_pkg_info(bpkgd); + show_pkg_info(pkgd); return 0; } diff --git a/bin/xbps-rindex/index-add.c b/bin/xbps-rindex/index-add.c index 26c3784c..cbb19eea 100644 --- a/bin/xbps-rindex/index-add.c +++ b/bin/xbps-rindex/index-add.c @@ -173,17 +173,6 @@ index_add(struct xbps_handle *xhp, int argc, char **argv, bool force) /* * Remove obsolete package objects. */ - xbps_dictionary_remove(newpkgd, "archive-compression-type"); - xbps_dictionary_remove(newpkgd, "build-date"); - xbps_dictionary_remove(newpkgd, "build_date"); - xbps_dictionary_remove(newpkgd, "conf_files"); - xbps_dictionary_remove(newpkgd, "filename"); - xbps_dictionary_remove(newpkgd, "homepage"); - xbps_dictionary_remove(newpkgd, "license"); - xbps_dictionary_remove(newpkgd, "maintainer"); - xbps_dictionary_remove(newpkgd, "packaged-with"); - xbps_dictionary_remove(newpkgd, "source-revisions"); - xbps_dictionary_remove(newpkgd, "long_desc"); xbps_dictionary_remove(newpkgd, "pkgname"); xbps_dictionary_remove(newpkgd, "version"); /*