diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-12 09:37:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-12 09:37:38 +0000 |
| commit | 7e4ba8d75c2f8d118c50938a052d6a798fb86a3a (patch) | |
| tree | 6593be27dac8848b86fd8562ce661db06ccb8dcf /main/aports-build | |
| parent | b2480ea645e0384152d0f6d2ab4dd64823f63718 (diff) | |
| download | aports-7e4ba8d75c2f8d118c50938a052d6a798fb86a3a.tar.bz2 aports-7e4ba8d75c2f8d118c50938a052d6a798fb86a3a.tar.xz | |
main/aports-build: fix rsync mqtt notifications
use the directory as payload for the rsync notification instead of
commit. This makes it easier for mirrors to know what to sync.
Diffstat (limited to 'main/aports-build')
| -rw-r--r-- | main/aports-build/APKBUILD | 10 | ||||
| -rw-r--r-- | main/aports-build/aports-build | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD index 99fa2d7ec..3d4e3009e 100644 --- a/main/aports-build/APKBUILD +++ b/main/aports-build/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=aports-build -pkgver=0.8 -pkgrel=3 +pkgver=0.9 +pkgrel=0 pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux" url="http://alpinelinux.org" arch="noarch" @@ -44,12 +44,12 @@ package() { } -md5sums="3153700be247053895ec63219e0fbe33 aports-build +md5sums="28f467dd244de934b7bc6a4a76b17227 aports-build 4ca3699a6df13cc937b267a28207b572 aports-build.initd c02d90b2bb0c48e416b707caa8766c50 mqtt-exec.aports-build.confd" -sha256sums="d124660df01db18ce65a951fb31cb0466fe40cf54239a19a666e4c22c980c362 aports-build +sha256sums="bad4ba5d231709ff3ac85aec9f45c8a3ad0d28b6d1ddffa38fd5f2f7e5debae4 aports-build a4a8756bc10d27219f5d569b2ea12450c864be439dac1fccb2b79dd374dd525a aports-build.initd 7d2001688c3776ffb53c422dee424bcf0346ae20f3df5c6c2f4944022b19cb4d mqtt-exec.aports-build.confd" -sha512sums="55e8a0b5f11ca62c7b66098ce0036070f576e0fcef717d72a4f64b3a7d3fd06060fcd5e53124d8272bc6cc5e8fb58ebabb5ad4146f600c6d3ead2cb4f86edb1d aports-build +sha512sums="75b6ab26e050db67b1ba2fbee3e231e3c988acd737fb0f3eb14ae65910a1912ad60c2ac56fa8fac5155922ab0a1c48ec394788349f070d7ce4c48b7c74f7cc03 aports-build e5bb9b219a5e03cc594bd1ffe064d9c531f2dc2f50b4cdf66014c49e9dc42b04133968dda0da0b3d572663523ba47a1d77a945f220a85e699930590bf163739c aports-build.initd 93d26e2055dbb02e863bf76b64a549c100decec3fda612ce96ca1464e6d61befa9f57f202553a25cf323e67e266f532d19c7423ff070943a59b3973946d949fe mqtt-exec.aports-build.confd" diff --git a/main/aports-build/aports-build b/main/aports-build/aports-build index 635be1a54..7ccbe03d1 100644 --- a/main/aports-build/aports-build +++ b/main/aports-build/aports-build @@ -78,7 +78,7 @@ new_release() { return 1 fi sh mklatest.sh || return 1 - mkdir -p "$upload_iso" + ssh $upload_host mkdir -p "${upload_iso#${upload_host}:}" if ! [ -e "$yaml" ]; then yaml="" fi @@ -167,8 +167,12 @@ while true; do for i in $upload_pkg; do local repo for repo in $repos; do - rsync -ruv --delete-delay --delay-updates $repo/$arch $i/$repo/ - rc=$(( $rc + $? )) + if rsync -ruv --delete-delay --delay-updates \ + $repo/$arch $i/$repo/; then + $upload_msg "$rel/$repo/$arch" + else + rc=1 + fi done done [ $rc -eq 0 ] && touch /tmp/uploaded && sudo apk update @@ -178,12 +182,11 @@ while true; do if $do_release; then if new_release ${_current_tag#v}; then + $upload_msg "$rel/releases/$arch" send_irc "release $_current_tag uploaded" fi fi - # notify mirrors that they can upload now if they want - $upload_msg "$_current" done # cleanup |