Signed-off-by: Allan McRae --- config.local.svn-community | 6 ++++-- config.local.svn-packages | 6 ++++-- db-functions | 3 +++ db-remove | 1 + db-update | 9 ++++++--- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config.local.svn-community b/config.local.svn-community index 105ea66..69b6d61 100644 --- a/config.local.svn-community +++ b/config.local.svn-community @@ -1,10 +1,12 @@ -PKGREPOS=('community' 'community-testing' 'community-staging' 'multilib' 'multilib-testing' 'multilib-staging') +PKGREPOS=('community' 'community-debug' 'community-testing' 'community-testing-debug' + 'community-staging' 'community-staging-debug' 'multilib' 'multilib-debug' + 'multilib-testing' 'multilib-testing-debug' 'multilib-staging' 'multilib-staging-debug') PKGPOOL='pool/community' SRCPOOL='sources/community' SVNREPO='file:///srv/repos/svn-community/svn' SVNUSER='svn-community' TESTING_REPO='community-testing' -STABLE_REPOS=('community') +STABLE_REPOS=('community' 'community-debug) CLEANUP_DESTDIR="/srv/repos/svn-community/package-cleanup" SOURCE_CLEANUP_DESTDIR="/srv/repos/svn-community/source-cleanup" diff --git a/config.local.svn-packages b/config.local.svn-packages index 958a483..7648a98 100644 --- a/config.local.svn-packages +++ b/config.local.svn-packages @@ -1,10 +1,12 @@ -PKGREPOS=('core' 'extra' 'testing' 'staging' 'kde-unstable' 'gnome-unstable') +PKGREPOS=('core' 'core-debug' 'extra' 'extra-debug' + 'testing' 'testing-debug' 'staging' 'staging-debug' + 'kde-unstable' 'kde-unstable-debug' 'gnome-unstable' 'gnome-unstable-debug') PKGPOOL='pool/packages' SRCPOOL='sources/packages' SVNREPO='file:///srv/repos/svn-packages/svn' SVNUSER='svn-packages' TESTING_REPO='testing' -STABLE_REPOS=('core' 'extra') +STABLE_REPOS=('core' 'core-debug' 'extra' 'extra-debug') CLEANUP_DESTDIR="/srv/repos/svn-packages/package-cleanup" SOURCE_CLEANUP_DESTDIR="/srv/repos/svn-packages/source-cleanup" diff --git a/db-functions b/db-functions index 7e1b3aa..18d1504 100644 --- a/db-functions +++ b/db-functions @@ -372,6 +372,9 @@ check_pkgsvn() { in_array "${repo}" ${PKGREPOS[@]} || return 1 + # remove debug suffix for svn check + repo=${repo%-debug} + if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}" arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \ diff --git a/db-remove b/db-remove index 25cb9a7..f38602a 100755 --- a/db-remove +++ b/db-remove @@ -48,5 +48,6 @@ done for tarch in ${tarches[@]}; do arch_repo_remove "${repo}" "${tarch}" ${remove_pkgs[@]} + arch_repo_remove "${repo}-debug" "${tarch}" ${remove_pkgs[@]/%/-debug} repo_unlock $repo $tarch done diff --git a/db-update b/db-update index cdc35a5..e953e0e 100755 --- a/db-update +++ b/db-update @@ -16,7 +16,7 @@ fi repos=() for staging_repo in ${staging_repos[@]##*/}; do - if in_array ${staging_repo} ${PKGREPOS[@]}; then + if in_array ${staging_repo} ${PKGREPOS[@]} ${PKGREPOS[@]/%/-debug}; then repos+=(${staging_repo}) fi done @@ -55,9 +55,12 @@ for repo in ${repos[@]}; do die "Package ${repo}/${pkg##*/} does not have a valid packager" fi done - if ! check_splitpkgs ${repo} ${pkgs[@]}; then - die "Missing split packages for ${repo}" + if [[ $repo != *-debug ]]; then + if ! check_splitpkgs ${repo} ${pkgs[@]}; then + die "Missing split packages for ${repo}" + fi fi + # TODO: add check that non-debug version of debug packages exist else die "Could not read ${STAGING}" fi -- 2.5.0