From 6ce3ddee58415e052ec578e777994a60c7e4c3a3 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 17 Apr 2011 03:11:36 -0300 Subject: sourceballs2 --- cron-jobs/sourceballs2 | 15 +++++++++++++-- db-functions | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2 index ba35298..b70f417 100644 --- a/cron-jobs/sourceballs2 +++ b/cron-jobs/sourceballs2 @@ -21,8 +21,9 @@ find "${ARCH_BASE}/${SRCPOOL}" -xtype f -name "*${SRCEXT}" -printf '%f\n' | sort pushd "${SVNREPO}" >/dev/null -failedpkgs=() for repo in ${PKGREPOS[@]}; do + failedpkgs=() + pushd $repo >/dev/null find . -maxdepth 1 -type d | while read pkg; do pushd "${SVNREPO}/$repo/$pkg" >/dev/null @@ -42,13 +43,23 @@ for repo in ${PKGREPOS[@]}; do [[ -e "${SRCPKGDEST}/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" ]] && \ continue + msg2 "$pkgbase-$pkgver-$pkgrel..." makepkg --allsource --ignorearch -c - [[ $? -ne 0 ]] && \ + [[ $? -ne 0 ]] && { + warning "Failed." failedpkgs[${#failedpkgs[*]}]="${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" + } done popd >/dev/null + + if [ ${#failedpkgs[@]} -ge 1 ]; then + msg "Failed to create source packages for [${repo}]..." + for failed_pkg in ${failedpkgs[@]}; do + msg2 "${failed_pkg}" + done + fi done # Cleanup old source packages diff --git a/db-functions b/db-functions index e2731cb..5953ed1 100644 --- a/db-functions +++ b/db-functions @@ -353,6 +353,7 @@ check_splitpkgs() { for pkgfile in ${pkgfiles[@]}; do issplitpkg "${pkgfile}" || continue local _pkgbase="$(getpkgbase ${pkgfile})" + msg2 "Checking $_pkgbase" local _pkgname="$(getpkgname ${pkgfile})" local _pkgarch="$(getpkgarch ${pkgfile})" mkdir -p "${repo}/${_pkgarch}/${_pkgbase}" -- cgit v1.2.3-54-g00ecf From 86d44994d4129c0cf0ffdc9cba71303b870f14d8 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 17 Apr 2011 03:24:42 -0300 Subject: fixed merge --- db-functions | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/db-functions b/db-functions index 6e0a6d3..fb20e3e 100644 --- a/db-functions +++ b/db-functions @@ -497,10 +497,7 @@ arch_repo_add() { # package files might be relative to repo dir pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null -<<<<<<< HEAD - repo-add -q "${repo}${DBEXT}" ${pkgs[@]} >/dev/null \ -======= - /usr/bin/repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \ + repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \ >>>>>>> 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 || error "repo-add ${repo}${DBEXT} ${pkgs[@]}" /usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \ @@ -520,11 +517,7 @@ arch_repo_remove() { error "No database found at '${dbfile}'" return 1 fi -<<<<<<< HEAD - repo-remove -q "${dbfile}" ${pkgs[@]} >/dev/null \ -======= - /usr/bin/repo-remove -q "${dbfile}" ${pkgs[@]} \ ->>>>>>> 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 + repo-remove -q "${dbfile}" ${pkgs[@]} \ || error "repo-remove ${dbfile} ${pkgs[@]}" /usr/bin/repo-remove -q "${filesfile}" ${pkgs[@]} \ || error "repo-remove ${filesfile} ${pkgs[@]}" -- cgit v1.2.3-54-g00ecf From e891caf97ee563e52b8f5e1f2448db2b0dc49228 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 17 Apr 2011 03:26:03 -0300 Subject: More merge fixes --- db-functions | 1 - 1 file changed, 1 deletion(-) diff --git a/db-functions b/db-functions index fb20e3e..ff38d62 100644 --- a/db-functions +++ b/db-functions @@ -498,7 +498,6 @@ arch_repo_add() { # package files might be relative to repo dir pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null repo-add -q "${repo}${DBEXT}" ${pkgs[@]} \ ->>>>>>> 1ce0c6368d0908e25f9bd1bb8183b5f29053fac8 || error "repo-add ${repo}${DBEXT} ${pkgs[@]}" /usr/bin/repo-add -f -q "${repo}${FILESEXT}" ${pkgs[@]} \ || error "repo-add -f ${repo}${FILESEXT} ${pkgs[@]}" -- cgit v1.2.3-54-g00ecf