diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-04 17:24:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-04 17:26:06 +0000 |
| commit | eee3f9419fa814b8ac930d66dca479e01a971588 (patch) | |
| tree | 44dcaccf58d3e7e1569da491978b5b6ab8bc1d8a /main/aports-build | |
| parent | 4cf3f5dd8a9c4c28f1d4cfcfc9d0fdc6e2e68fbc (diff) | |
| download | aports-eee3f9419fa814b8ac930d66dca479e01a971588.tar.bz2 aports-eee3f9419fa814b8ac930d66dca479e01a971588.tar.xz | |
main/aports-build: make error messages retained
and clear error on first successful build
Diffstat (limited to 'main/aports-build')
| -rw-r--r-- | main/aports-build/APKBUILD | 12 | ||||
| -rw-r--r-- | main/aports-build/report-build-errors.lua | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/main/aports-build/APKBUILD b/main/aports-build/APKBUILD index d55543ad6a..57be7fbb9d 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=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="MQTT based build-on-git-push scripts for Alpine Linux" url="http://alpinelinux.org" arch="noarch" @@ -19,10 +19,10 @@ source="aports-build report-build-errors.lua " -_builddir= +builddir="$srcdir" prepare() { local i - cd "$_builddir" + cd "$builddir" for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; @@ -31,11 +31,11 @@ prepare() { } build() { - cd "$_builddir" + cd "$builddir" } package() { - cd "$_builddir" + cd "$builddir" install -Dm755 "$srcdir"/aports-build \ "$pkgdir"/usr/bin/aports-build || return 1 install -d "$pkgdir"/etc/init.d || return 1 @@ -52,4 +52,4 @@ package() { sha512sums="62d12aa79e8d864e2e5a2a742bcd501de1339f9e00e425055fd3e9538f88492cdba406fb5fcb2621e46501cff2412ee91c90c52ad51098925000dae20c7a87ae aports-build 821035bda47152c341ec94bf960fa67e3377051826712ceb74f39103e6e422777b6e082231bfb87865653d2b93b7d3154cfc24abf65a52e3e66da69412dd7e41 aports-build.initd 93d26e2055dbb02e863bf76b64a549c100decec3fda612ce96ca1464e6d61befa9f57f202553a25cf323e67e266f532d19c7423ff070943a59b3973946d949fe mqtt-exec.aports-build.confd -3453e45cb687d2af6cd1c490fd5b7134f643570a84b354b57ba49295e5a0d01ef65abc0909aeb424cbe48aa280c19cc4f1dce5f4f10e5137a80395c3be00c733 report-build-errors.lua" +ded99f4c9474e4dc91605de71919deebbeb8e2e3ebcc9d61890f327bb6220d891a9f2a6c615929cc53bd8007b1a1dbd827bc55cd5cbdd1a6661fcdafa4912950 report-build-errors.lua" diff --git a/main/aports-build/report-build-errors.lua b/main/aports-build/report-build-errors.lua index e91044fed4..4002f93ee2 100644 --- a/main/aports-build/report-build-errors.lua +++ b/main/aports-build/report-build-errors.lua @@ -39,9 +39,11 @@ function m.postbuild(aport, success, repodest, arch, logfile) run{"scp", logfile, loghost..":"..logdir} end + local topic = ("build/%s/errors"):format(hostname) + local payload = nil + if not success then - local topic = ("build/%s/errors"):format(hostname) - local payload = json.encode{ + payload = json.encode{ pkgname = aport.pkgname, hostname = hostname, reponame = aport:get_repo_name(), @@ -51,8 +53,8 @@ function m.postbuild(aport, success, repodest, arch, logfile) aport.pkgname, aport.pkgver, aport.pkgrel), status = success } - publish.single(topic, payload, nil, nil, "msg.alpinelinux.org") end + publish.single(topic, payload, nil, true, "msg.alpinelinux.org") end return m |