diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2016-02-07 09:47:03 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2016-02-07 09:47:03 +0100 |
| commit | fbd17dc8edc59e3b5c67acafebfcdda73e409e00 (patch) | |
| tree | 4602f11c13bec71e6fe85e66ecfce1e33ab4781b | |
| parent | 4fcedea4ae5fb8788c7ef0ddd907ed8b02d14a5b (diff) | |
Remove separate creation of file databases
With pacman 5.0 repo-add and repo-remove handle file databases by default.
| -rw-r--r-- | db-functions | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/db-functions b/db-functions index 7e1b3aa..667ac8d 100644 --- a/db-functions +++ b/db-functions @@ -169,7 +169,6 @@ trap cleanup EXIT repo_lock () { local LOCKDIR="$TMPDIR/.repolock.$1.$2" local DBLOCKFILE="${FTP_BASE}/${1}/os/${2}/${1}${DBEXT}.lck" - local FILESLOCKFILE="${FTP_BASE}/${1}/os/${2}/${1}${FILESEXT}.lck" local _count local _trial local _timeout @@ -181,10 +180,6 @@ repo_lock () { error "Repo [${1}] (${2}) is already locked by repo-{add,remove} process $(cat $DBLOCKFILE)" return 1 fi - if [ -f "${FILESLOCKFILE}" ]; then - error "Repo [${1}] (${2}) is already locked by repo-{add,remove} process $(cat ${FILESLOCKFILE})" - return 1 - fi if [ $# -eq 2 ]; then _lockblock=true @@ -508,8 +503,6 @@ arch_repo_add() { pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null /usr/bin/repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \ || error "repo-add ${repo}${DBEXT} ${pkgs[@]}" - /usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \ - || error "repo-add -f ${repo}${FILESEXT} ${pkgs[@]}" popd >/dev/null set_repo_permission "${repo}" "${arch}" @@ -521,7 +514,6 @@ arch_repo_remove() { local arch=$2 local pkgs=(${@:3}) local dbfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" - local filesfile="${FTP_BASE}/${repo}/os/${arch}/${repo}${FILESEXT}" if [ ! -f "${dbfile}" ]; then error "No database found at '${dbfile}'" @@ -529,8 +521,6 @@ arch_repo_remove() { fi /usr/bin/repo-remove -q "${dbfile}" ${pkgs[@]} \ || error "repo-remove ${dbfile} ${pkgs[@]}" - /usr/bin/repo-remove -q "${filesfile}" ${pkgs[@]} \ - || error "repo-remove ${filesfile} ${pkgs[@]}" set_repo_permission "${repo}" "${arch}" REPO_MODIFIED=1 |