main/lua-aports: dont echo progress for packages that are skipped

2 files changed, 19 insertions, 21 deletions

diff --git a/main/lua-aports/APKBUILD b/main/lua-aports/APKBUILD
index 05848eded1..81ad11d1fd 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=1
+pkgrel=2
 pkgdesc="Lua modules for parsing aports tree"
 url="http://dev.alpinelinux.org/archive/lua-aports/"
 arch="noarch"
@@ -13,7 +13,7 @@ install=""
 replaces="abuild"
 subpackages=""
 source="http://dev.alpinelinux.org/archive/lua-aports/lua-aports-$pkgver.tar.xz
-	0001-buildrepo-update-buildstats-only-when-something-is-a.patch
+	skip-messages.patch
 	"
 
 _builddir="$srcdir"/lua-aports-$pkgver
@@ -37,8 +37,8 @@ package() {
 }
 
 md5sums="ec2caf078bc59fd90a65ffb3dd31a495  lua-aports-0.2.tar.xz
-61213713ddab38a4449095bc0cb86ef5  0001-buildrepo-update-buildstats-only-when-something-is-a.patch"
+09c1b56fb8178a50d70c7f964c59e868  skip-messages.patch"
 sha256sums="2a1c6e4cbf1176bb7094312b646c7d1dfe9778aa2478f2251e5a705f1fd55907  lua-aports-0.2.tar.xz
-968257f69b8373daa8637ebe09c75069680c4c2fa3658e20d38e0f13aee4c384  0001-buildrepo-update-buildstats-only-when-something-is-a.patch"
+d553601fc83fd1a2003f445ba682fe042cb63e494de76949b240409247fe1e9e  skip-messages.patch"
 sha512sums="f96c341bfb659f8667695fea18e4170c51d41ffad95d7caa18c5284577fa8c97aa587ccff03ab66105a88c0cb9b1597e080d0b2234bc9c122a2d70b76a0de4a7  lua-aports-0.2.tar.xz
-bab7e36d18c52631bb62de420fb53243fe7460e0400f491fb19aa94cfdfd10ac5b57fecec4a237861a988722a6290bd3b9c0c978235838871c0ff1e06e5f07a6  0001-buildrepo-update-buildstats-only-when-something-is-a.patch"
+cdaa45c51b00ae80da950762fa64ba42cd6f40a872910c21b6ef8d4195f78a0637ed12daa6c3eb09b967e456bd4a76cdb7377630d8e9a27f3b3b9c931252e138  skip-messages.patch"
diff --git a/main/lua-aports/0001-buildrepo-update-buildstats-only-when-something-is-a.patch b/main/lua-aports/skip-messages.patch
index 19692ae71e..878733cf34 100644
--- a/main/lua-aports/0001-buildrepo-update-buildstats-only-when-something-is-a.patch
+++ b/main/lua-aports/skip-messages.patch
@@ -1,18 +1,18 @@
-From b80a71e8d8dd43dc23a84f93cb6ccab523f1f942 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 1 Apr 2014 14:15:51 +0000
-Subject: [PATCH] buildrepo: update buildstats only when something is actually
- getting built
-
----
- buildrepo.lua | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
 diff --git a/buildrepo.lua b/buildrepo.lua
-index 21b444b..9a0d019 100755
+index 21b444b..192d0f1 100755
 --- a/buildrepo.lua
 +++ b/buildrepo.lua
-@@ -179,16 +179,19 @@ for _,repo in pairs(args) do
+@@ -74,9 +74,6 @@ local function build_aport(aport, repodest, logdir, skip_failed)
+ 		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
@@ -23,9 +23,10 @@ index 21b444b..9a0d019 100755
  			warn("%s: Skipped due to missing dependencies", aport.pkgname)
 -		elseif build_aport(aport, repodest, logdir, opts.s) then
 -			built = built + 1
- 		else
+-		else
 -			if not opts.k then
 -				os.exit(1)
++		elseif not (skip_failed and skip_aport(aport)) then
 +			io.write(("%d/%d %d/%d %s %s\n"):format(tried, #pkgs,
 +					totally_built,
 +					stats[repo].relevant_aports,
@@ -39,6 +40,3 @@ index 21b444b..9a0d019 100755
  			end
  		end
  	end
--- 
-1.9.1
-