# HG changeset patch # User Franz Glasner # Date 1553168087 -3600 # Node ID 0ae7697702b39ec95c59000095a2adc83b1c1e4b # Parent 6c8ee1ef9ef294c3756ed6d0636a79e1cddbe0d8 Handling of mapped packages is basically implemented. A workaround for the bug below is needed. BUGS: "pkg rquery -I" does **not** query the port's package INDEX file. It queries only the repository databases. NOTE: "pkg version -I" works correctly and opens the port's package INDEX file. diff -r 6c8ee1ef9ef2 -r 0ae7697702b3 bin/check-ports --- a/bin/check-ports Thu Mar 21 09:39:39 2019 +0100 +++ b/bin/check-ports Thu Mar 21 12:34:47 2019 +0100 @@ -95,6 +95,29 @@ return 1 } +get_immediate_index_version() { + local _name _val _rv + + _name=$1 + + _val=$(pkg rquery -I "${_name}" | cut -f 1 -d '|') + _rv=$? + immediate_index_version=${_val##*-} + return ${_rv} +} + +get_immediate_remote_repo_version() { + local _repo _name _version _rv + + _repo=$1 + _name=$2 + + _version=$(pkg rquery -U -r "${_repo}" '%v' "${_name}") + _rv=$? + eval immediate_remote_repo_version_${_repo}=\"\${_version}\" + return ${_rv} +} + assert_local_version() { local _name _version _n _v _r @@ -262,11 +285,14 @@ fi if [ -n "${mapped_package_name}" ] ; then echo " ---> ${mapped_package_name}" - get_remote_repo_data ${LOCAL_REPO} ${mapped_package_name} - get_remote_repo_data ${LOCALBSDPORTS_REPO} ${mapped_package_name} - get_remote_repo_data ${FREEBSD_REPO} ${mapped_package_name} - echo " LocalBSDPorts: ${remote_label_LocalBSDPorts} ${remote_descr_LocalBSDPorts}" - echo " LocalRepo : ${remote_label_LocalRepo} ${remote_descr_LocalRepo}" + get_immediate_index_version "${mapped_package_name}" + get_immediate_remote_repo_version ${LOCAL_REPO} ${mapped_package_name} + get_immediate_remote_repo_version ${LOCALBSDPORTS_REPO} ${mapped_package_name} + get_immediate_remote_repo_version ${FREEBSD_REPO} ${mapped_package_name} + echo " INDEX : ${immediate_index_version}" + echo " FreeBSD : ${immediate_remote_repo_version_FreeBSD}" + echo " LocalBSDPorts: ${immediate_remote_repo_version_LocalBSDPorts}" + echo " LocalRepo : ${immediate_remote_repo_version_LocalRepo}" fi fi done <