diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2018-08-31 19:36:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-08-31 19:36:32 -0400 |
| commit | c1dd10cce04633fbf2d018ec7927e1348dc24f84 (patch) | |
| tree | dfc7f66a6ecb069e49a39582e66e287a092cb50b /db-import-pkg | |
| parent | 68186ca2355eb5126301b667e9174d149d8c7fc4 (diff) | |
db-import-pkg: Don't make assumptions about the upstream's DBEXT.
Just know that there's a ".db" symlink to it.
Diffstat (limited to 'db-import-pkg')
| -rwxr-xr-x | db-import-pkg | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/db-import-pkg b/db-import-pkg index 115c7ba..d05f4f8 100755 --- a/db-import-pkg +++ b/db-import-pkg @@ -18,10 +18,9 @@ readonly -a UPSTREAMS=(packages community archlinux{32,arm}) # TODO: we could be doing without things other than what is in # ${ARCHTAGS[@]} fetch_dbs() { - rsync "${extra[@]}" --no-motd -mrtlH --no-p \ + rsync "${extra[@]}" --no-motd -mrtLH --no-p \ --include="*/" \ --include="*.db" \ - --include="*${DBEXT}" \ --exclude="*" \ --delete-after \ "$1" "$2" @@ -265,16 +264,12 @@ main() { for _tag in "${ARCHTAGS[@]}"; do _repo=${_tag%-*} _arch=${_tag##*-} - # FIXME: this assumes that the local DBEXT and the - # imported DBEXT are the same, which is potentially - # not true. - # # FIXME: this should use db-functions to lock the # repos while we read them. - db_file="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}${DBEXT}" + db_file="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}.db" db_list_pkgs "$db_file" > "${WORKDIR}/old/${_tag}.txt" - db_file="${WORKDIR}/rsync/$(get_repo_dir "${_repo}" "${_arch}")/${_repo}${DBEXT}" + db_file="${WORKDIR}/rsync/$(get_repo_dir "${_repo}" "${_arch}")/${_repo}.db" db_list_pkgs "$db_file" | filter_blacklisted > "${WORKDIR}/new/${_tag}.txt" done |