merge 6.2.3 release

FossilOrigin-Name: e08132c5cac34d5b3635961ee24a3eed506c7eac5ffd0f76639b4f3dd908d23e

1 files changed, 2 insertions, 2 deletions

diff --git a/src/cpt-lib.in b/src/cpt-lib.in
index d0de978..cfa0b18 100644
--- a/src/cpt-lib.in
+++ b/src/cpt-lib.in
@@ -1116,7 +1116,7 @@ pkg_tar() {
     log "$1" "Creating tarball"
 
     # Read the version information to name the package.
-    read -r version release < "$(pkg_find "$1")/version"
+    read -r version release < "$pkg_dir/$1/$pkg_db/$1/version"
 
     # Create a tarball from the contents of the built package.
     cd "$pkg_dir/$1"
@@ -1348,7 +1348,7 @@ pkg_checksums() {
 pkg_verify() {
     # Verify all package checksums. This is achieved by generating a new set of
     # checksums and then comparing those with the old set.
-    vcmd="NR==FNR{a[\$1];next}/^git  .*/{next}!((\$1)in a){exit 1}"
+    vcmd="NR==FNR{a[\$1];next}/^git .*/{next}!((\$1)in a){exit 1}END{if(NR/2!=FNR)exit 1}"
 
     for pkg; do
         repo_dir=$(pkg_find "$pkg")