diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-02 12:11:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-02 12:11:42 +0000 |
| commit | 66d59399b4e12e0d5d530f5ede0f35643d7c2e2f (patch) | |
| tree | c98e72838650ea6aa273841c3fbe4f03f23d580b /main/lua-aports | |
| parent | a0cec2e3a7ae0c9f9535ed937caa00c2ff0fc95c (diff) | |
| download | aports-66d59399b4e12e0d5d530f5ede0f35643d7c2e2f.tar.bz2 aports-66d59399b4e12e0d5d530f5ede0f35643d7c2e2f.tar.xz | |
main/lua-aports: fix regression
fix regression in checking if previous build failed
Diffstat (limited to 'main/lua-aports')
| -rw-r--r-- | main/lua-aports/APKBUILD | 8 | ||||
| -rw-r--r-- | main/lua-aports/skip-messages.patch | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/main/lua-aports/APKBUILD b/main/lua-aports/APKBUILD index 81ad11d1fd..5ff1c16741 100644 --- a/main/lua-aports/APKBUILD +++ b/main/lua-aports/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lua-aports pkgver=0.2 -pkgrel=2 +pkgrel=3 pkgdesc="Lua modules for parsing aports tree" url="http://dev.alpinelinux.org/archive/lua-aports/" arch="noarch" @@ -37,8 +37,8 @@ package() { } md5sums="ec2caf078bc59fd90a65ffb3dd31a495 lua-aports-0.2.tar.xz -09c1b56fb8178a50d70c7f964c59e868 skip-messages.patch" +89e92ecf9d35de3fa5dd837aeb3f489c skip-messages.patch" sha256sums="2a1c6e4cbf1176bb7094312b646c7d1dfe9778aa2478f2251e5a705f1fd55907 lua-aports-0.2.tar.xz -d553601fc83fd1a2003f445ba682fe042cb63e494de76949b240409247fe1e9e skip-messages.patch" +5825e94ab3d8ef76926e07037d9397c3137d305068ad99afac8c5eb568845e69 skip-messages.patch" sha512sums="f96c341bfb659f8667695fea18e4170c51d41ffad95d7caa18c5284577fa8c97aa587ccff03ab66105a88c0cb9b1597e080d0b2234bc9c122a2d70b76a0de4a7 lua-aports-0.2.tar.xz -cdaa45c51b00ae80da950762fa64ba42cd6f40a872910c21b6ef8d4195f78a0637ed12daa6c3eb09b967e456bd4a76cdb7377630d8e9a27f3b3b9c931252e138 skip-messages.patch" +ef5b782f2b68cafb40f42f9a2f943d8e9bc4436ddff04d29d1915f679a0583c624141094f2b6ce42fd867bbfa4a4227ae6945c3f305494738d72debec8d26b4f skip-messages.patch" diff --git a/main/lua-aports/skip-messages.patch b/main/lua-aports/skip-messages.patch index 878733cf34..65959ede7b 100644 --- a/main/lua-aports/skip-messages.patch +++ b/main/lua-aports/skip-messages.patch @@ -1,8 +1,15 @@ diff --git a/buildrepo.lua b/buildrepo.lua -index 21b444b..192d0f1 100755 +index 21b444b..23260b9 100755 --- a/buildrepo.lua +++ b/buildrepo.lua -@@ -74,9 +74,6 @@ local function build_aport(aport, repodest, logdir, skip_failed) +@@ -68,15 +68,12 @@ local function skip_aport(aport) + return true + end + +-local function build_aport(aport, repodest, logdir, skip_failed) ++local function build_aport(aport, repodest, logdir) + local success, errmsg = lfs.chdir(aport.dir) + if not success then err("%s", errmsg) return nil end @@ -26,12 +33,12 @@ index 21b444b..192d0f1 100755 - else - if not opts.k then - os.exit(1) -+ elseif not (skip_failed and skip_aport(aport)) then ++ elseif not (opts.s and skip_aport(aport)) then + io.write(("%d/%d %d/%d %s %s\n"):format(tried, #pkgs, + totally_built, + stats[repo].relevant_aports, + aport.pkgname, aport.pkgver)) -+ if build_aport(aport, repodest, logdir, opts.s) then ++ if build_aport(aport, repodest, logdir) then + built = built + 1 + else + if not opts.k then |