diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-08 01:43:32 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-08 01:43:32 -0400 |
commit | 70357110197aa7e954bd50593c36721f4d547911 (patch) | |
tree | e9693b71cd406490018c16a5d2cb5d688091efd5 | |
parent | d4d130dfec6f43449f6d5a0ce639ebc1d9b57800 (diff) | |
parent | 4bc5d6607295d4054d67e0dfe6da56cbb7381999 (diff) |
Merge branch 'pending'parabola/20160708
-rw-r--r-- | db-functions | 11 | ||||
-rwxr-xr-x | db-update | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/db-functions b/db-functions index f021299..1d37123 100644 --- a/db-functions +++ b/db-functions @@ -378,17 +378,6 @@ check_pkgrepos() { [ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}" ] && return 1 [ -f "${FTP_BASE}/${PKGPOOL}/${pkgfile##*/}.sig" ] && return 1 - local repo - local arch - for repo in "${PKGREPOS[@]}"; do - for arch in "${ARCHES[@]}"; do - [ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT} ] && return 1 - [ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgname}-${pkgver}-${pkgarch}"${PKGEXT}.sig ] && return 1 - [ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}" ] && return 1 - [ -f "${FTP_BASE}/${repo}/os/${arch}/${pkgfile##*/}.sig" ] && return 1 - done - done - return 0 } @@ -43,9 +43,21 @@ for repo in "${repos[@]}"; do if ! check_pkgfile "${pkg}"; then die "Package %s is not consistent with its meta data" "${repo}/${pkg##*/}" fi + if "${REQUIRE_SIGNATURE}" && ! pacman-key -v "${pkg}.sig" >/dev/null 2>&1; then + die "Package %s does not have a valid signature" "${repo}/${pkg##*/}" + fi if ! check_pkgrepos "${pkg}"; then die "Package %s already exists in another repository" "${repo}/${pkg##*/}" fi + if ! check_packager "${pkg}"; then + die "Package ${repo}/${pkg##*/} does not have a valid packager" + fi + if ! check_buildinfo "${pkg}"; then + die "Package ${repo}/${pkg##*/} does not have a .BUILDINFO file" + fi + if ! check_builddir "${pkg}"; then + die "Package ${repo}/${pkg##*/} was not built in a chroot" + fi done # This is fucking obnoxious #if ! check_splitpkgs ${repo} "${pkgs[@]}"; then |