remove git version check in repo.sh

pull/162/head
Jan Houben 8 years ago
parent 861be2a15e
commit e7676cd55e
No known key found for this signature in database
GPG Key ID: B7C6B271DEB42D74
  1. 41
      repo.sh

@ -123,29 +123,22 @@ repo_package_list() {
vers=$(package_version_from_path ${pkg})
# Version match check: arch: x86_64 name: spl-utils-linux-git vers: 0.7.0_rc1_r0_g4fd75d3_4.7.2_1-4 vers_match: 0.6.5.8.*4.7.2_1-4
debug "spl_pkgver: ${spl_pkgver}"
debug "zfs_pkgver: ${zfs_pkgver}"
if [[ ${pkg} =~ .*spl-.* ]]; then
match="${spl_pkgver}-${spl_pkgrel}"
elif [[ ${pkg} =~ .*zfs-.* ]]; then
match="${zfs_pkgver}-${zfs_pkgrel}"
fi
debug "Version match check: arch: ${arch} name: ${name} vers: ${vers} vers_match: ${match}"
if ! [[ ${vers} =~ ^${match} ]] ; then
debug "Version mismatch!"
if [[ ${name} =~ .*-git ]]; then
error "Attempting to add Git packages that are out of date!"
error "package version from filesystem: ${vers}"
error "calculated version from git: ${match}"
haz_error=1
if [[ ${dry_run} -ne 1 ]]; then
exit 1
fi
if ! [[ ${name} =~ .*-git ]]; then
# Version match check: arch: x86_64 name: spl-utils-linux-git vers: 0.7.0_rc1_r0_g4fd75d3_4.7.2_1-4 vers_match: 0.6.5.8.*4.7.2_1-4
debug "spl_pkgver: ${spl_pkgver}"
debug "zfs_pkgver: ${zfs_pkgver}"
if [[ ${pkg} =~ .*spl-.* ]]; then
match="${spl_pkgver}-${spl_pkgrel}"
elif [[ ${pkg} =~ .*zfs-.* ]]; then
match="${zfs_pkgver}-${zfs_pkgrel}"
fi
debug "Version match check: arch: ${arch} name: ${name} vers: ${vers} vers_match: ${match}"
if ! [[ ${vers} =~ ^${match} ]] ; then
debug "Version mismatch!"
continue
fi
continue
fi
debug "Using: pkgname: ${name} pkgver: ${vers} pkgpath: ${pkg} pkgdest: ${repo_target}/${arch}"
@ -295,10 +288,6 @@ export spl_pkgver=""
for func in ${update_funcs[@]}; do
debug "Evaluating '${func}'"
if [[ ${func} =~ .*_git_.* ]]; then
# Update the local zfs/spl git repositories, this will change the calculated pkgver version of the PKGBUILD.
commands+=("update")
fi
"${func}"
repo_package_list
repo_package_backup

Loading…
Cancel
Save