diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-07-25 11:41:49 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-07-25 11:41:49 +0300 |
| commit | d21e2c60f86b88b519534e4a7bbbe6502db5e279 (patch) | |
| tree | 8f440584815c4edc4ffa7d631e1a29638b58d84c /main | |
| parent | 210db65047405fd71163ade38d7bbada529ae9de (diff) | |
| download | aports-d21e2c60f86b88b519534e4a7bbbe6502db5e279.tar.bz2 aports-d21e2c60f86b88b519534e4a7bbbe6502db5e279.tar.xz | |
main/aaudit: fix commit without notification, add some error messages
Diffstat (limited to 'main')
| -rw-r--r-- | main/aaudit/APKBUILD | 14 | ||||
| -rwxr-xr-x | main/aaudit/aaudit | 1 | ||||
| -rw-r--r-- | main/aaudit/aaudit-server.lua | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/main/aaudit/APKBUILD b/main/aaudit/APKBUILD index b88f7cb1c9..11a3f20583 100644 --- a/main/aaudit/APKBUILD +++ b/main/aaudit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=aaudit -pkgver=0.6 +pkgver=0.7 pkgrel=0 pkgdesc="Alpine Auditor" url="http://alpinelinux.org" @@ -50,24 +50,24 @@ server() { } md5sums="b81b0707b297a69dacbc1606324de029 aaudit-common.lua -40131250bb7fd3c92e2b302682d5c5f7 aaudit-server.lua -028ecf2a733387560b15563de1777c68 aaudit +4950638ccc64b5c89777e53450d14907 aaudit-server.lua +246782b6d8a47dc3568f4c232e35b638 aaudit f5de73f12b6df1a751c89f19c92871be aaudit-shell feef077f56f40002ca11846512d347af aaudit-update-keys 9c88f34f561a2d0955b07de467b18a70 aaudit-repo 8a80554c91d9fca8acb82f023de02f11 aaudit.json f0e97a7a07a472278298b5999a397f58 aaudit-server.json" sha256sums="ee1998e730356c2de0ff9d5e27d9e0277e3c1f051777146b7c5b820437edfd7f aaudit-common.lua -6bb3968e0753e8ca6283f0ba838ce3cb18ea18ba7014bfa4c25e150093d48ba0 aaudit-server.lua -91b5247e856b6531796a0ac61c3c82a37880fbabc1afc9bf4793667f03fb3ea0 aaudit +eef60186a6f468a2d2a2bef3b0d211f74718b64357f08f36e1691d4b82e00e13 aaudit-server.lua +8c92fc5dd339883b940364ef27accb4d1756609a429682dd8f462b76d61fc8b7 aaudit 659c755cfca95a76da78f4d28d0ab9a32d55bea0077be7420ceaf9d45c518354 aaudit-shell 660dcf86f02a9d0e3ff47cb359e0291a0921d03215e368552a2878d2d691a9cc aaudit-update-keys 83868f17e1162e2b621eb2115a36f989c300aeda7cadf82ec1c991ee19d25664 aaudit-repo ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356 aaudit.json ab276c9caeaa238c8999c79cd3b016f4ba149e6793475c5cde088597cedd849c aaudit-server.json" sha512sums="aaa378fd710d17cb3663954648e97dd5128406cc6f37e9834075046aed1912dcc9e448b6c96502350b8d3496e00b7803cae671a4be2c12c584a84dc0b6e843e9 aaudit-common.lua -550385e27c7492e2234ddcf7c3c4a43dda2f3b598e52422af789febe68dfe0f88598c93f525f29f47173c878f4da4bef73c59eb8ca4605a8967634190a62605e aaudit-server.lua -e12b1623506382e04307f1c7fc361b544b4fbe992d41fcbaa7efd4c8568060fa7fad17e4db7a4ae96ebadc2b95f3c545809b948460a5446608bac6a35d3c35f3 aaudit +245af4789490bacca464266fe0e1a138fa539f4eaff02fb8dbceacf9a8c586702215ac0bbb56c42b551d1cc7c9560b61ca25985b92d39558d656d0f51eebcfc1 aaudit-server.lua +f9f7f9d12bcb08571d6f071ee7557ec9ca17fbaefd27e6dc085331d84434a42df05a483b8d11b187530f146757bce4390b9bb149791d2f63254ade80cf900801 aaudit 18499771d7d425f9305209c562eb8e62ef41910e88b08219baf010cdb472d49087080feb67384c4826c53bddcc0ce92c0c23c78df22dc40c64f1b17bf0ad05ec aaudit-shell aec728a9a1e4c92baeb94a9d95e1785ea166652a157571fe2e848e71c1246635ecb99512e92435e1314c620b1fa8e4f37400350bed78bd375db4a63828c500f0 aaudit-update-keys 7507dea2b8ec4054e507aa3b42818863b9737402f3a9f967e16a63dd3ea12385463c2bce178a819a5f1fef76e74887a136de665e0b54172f1c1ce5f61b73403f aaudit-repo diff --git a/main/aaudit/aaudit b/main/aaudit/aaudit index 44652a1deb..6b021427de 100755 --- a/main/aaudit/aaudit +++ b/main/aaudit/aaudit @@ -93,6 +93,7 @@ SR:close() lpc.wait(pid) if reply then + reply.msg = reply.msg or "(No message. Server error?)" if reply.ok then io.write("OK: ",reply.msg,"\n") else diff --git a/main/aaudit/aaudit-server.lua b/main/aaudit/aaudit-server.lua index 89f2fc0219..f0f73ab6f1 100644 --- a/main/aaudit/aaudit-server.lua +++ b/main/aaudit/aaudit-server.lua @@ -123,8 +123,9 @@ local rt_keywords = { } local function sendcommitdiff(body, req, R, G) - if not body then return end - if not G.notify_emails then return end + if not body then return true end + if not G.notify_emails then return true end + if #G.notify_emails == 0 then return true end local mail = { from = req.committer, @@ -336,7 +337,7 @@ function M.repo_update(req,clientstream) os.execute(("git --git-dir='%s' branch --quiet -D import;".. "git --git-dir='%s' gc --quiet --prune=now") :format(repodir, repodir)) - return false, err + return false, err or "Sending commitdiff e-mail failed" end end os.execute(("git --git-dir='%s' branch --quiet --force master import;".. |