diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-02 12:17:41 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-02 12:17:41 +0000 |
commit | c2b0381fa2938ba661c00e3f6543480969b7ea54 (patch) | |
tree | 3f410040bcb4ebacb808a42b64e0710ba299ef8c /main | |
parent | 474fb2056b5dbb239f6087288f2ef4e9a19da068 (diff) | |
download | aports-c2b0381fa2938ba661c00e3f6543480969b7ea54.tar.bz2 aports-c2b0381fa2938ba661c00e3f6543480969b7ea54.tar.xz |
main/lua-aports: upgrade to 0.3
Diffstat (limited to 'main')
-rw-r--r-- | main/lua-aports/APKBUILD | 14 | ||||
-rw-r--r-- | main/lua-aports/skip-messages.patch | 49 |
2 files changed, 5 insertions, 58 deletions
diff --git a/main/lua-aports/APKBUILD b/main/lua-aports/APKBUILD index 5ff1c16741..fc2d48c878 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=3 +pkgver=0.3 +pkgrel=0 pkgdesc="Lua modules for parsing aports tree" url="http://dev.alpinelinux.org/archive/lua-aports/" arch="noarch" @@ -13,7 +13,6 @@ install="" replaces="abuild" subpackages="" source="http://dev.alpinelinux.org/archive/lua-aports/lua-aports-$pkgver.tar.xz - skip-messages.patch " _builddir="$srcdir"/lua-aports-$pkgver @@ -36,9 +35,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="ec2caf078bc59fd90a65ffb3dd31a495 lua-aports-0.2.tar.xz -89e92ecf9d35de3fa5dd837aeb3f489c skip-messages.patch" -sha256sums="2a1c6e4cbf1176bb7094312b646c7d1dfe9778aa2478f2251e5a705f1fd55907 lua-aports-0.2.tar.xz -5825e94ab3d8ef76926e07037d9397c3137d305068ad99afac8c5eb568845e69 skip-messages.patch" -sha512sums="f96c341bfb659f8667695fea18e4170c51d41ffad95d7caa18c5284577fa8c97aa587ccff03ab66105a88c0cb9b1597e080d0b2234bc9c122a2d70b76a0de4a7 lua-aports-0.2.tar.xz -ef5b782f2b68cafb40f42f9a2f943d8e9bc4436ddff04d29d1915f679a0583c624141094f2b6ce42fd867bbfa4a4227ae6945c3f305494738d72debec8d26b4f skip-messages.patch" +md5sums="d03218ceb198a339363e452dd6c3102b lua-aports-0.3.tar.xz" +sha256sums="f8e4ce1a60a61b9a6515ce36ceb56830da1bc0f0dd7300346bda357d9bb55fcd lua-aports-0.3.tar.xz" +sha512sums="e82bb3191958a123bcf16c17b2338cd0370d60b970ab15ac9f645972cf2b409618fd1c5b927ba854fb82468ab74d21dfd3cc1e363b513aa220905c4f89417a8b lua-aports-0.3.tar.xz" diff --git a/main/lua-aports/skip-messages.patch b/main/lua-aports/skip-messages.patch deleted file mode 100644 index 65959ede7b..0000000000 --- a/main/lua-aports/skip-messages.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/buildrepo.lua b/buildrepo.lua -index 21b444b..23260b9 100755 ---- a/buildrepo.lua -+++ b/buildrepo.lua -@@ -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 -- if skip_failed and skip_aport(aport) then -- return nil -- end - local logredirect = "" - if logdir ~= nil then - local dir = ("%s/%s"):format(logdir, aport.pkgname) -@@ -179,16 +176,19 @@ for _,repo in pairs(args) do - for aport in db:each_in_build_order(pkgs) do - tried = tried + 1 - local totally_built = stats[repo].relevant_aports - #pkgs + built -- io.write(("%d/%d %d/%d %s %s\n"):format(tried, #pkgs, -- totally_built, stats[repo].relevant_aports, -- aport.pkgname, aport.pkgver)) - if not db:known_deps_exists(aport) then - warn("%s: Skipped due to missing dependencies", aport.pkgname) -- elseif build_aport(aport, repodest, logdir, opts.s) then -- built = built + 1 -- else -- if not opts.k then -- os.exit(1) -+ 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) then -+ built = built + 1 -+ else -+ if not opts.k then -+ os.exit(1) -+ end - end - end - end |