X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 557C4DC7BB9 for ; Fri, 5 Jul 2013 04:21:55 +0000 (UTC) Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 1F10D20798 for ; Fri, 5 Jul 2013 00:21:50 -0400 (EDT) Received: from frontend2.nyi.mail.srv.osa ([10.202.2.161]) by compute1.internal (MEProxy); Fri, 05 Jul 2013 00:21:50 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :in-reply-to:references; s=smtpout; bh=WFGCTYdB/imCxOmHK8MN9GwfT lc=; b=bH/x6gMSuh1Dn0ocGPzzM9c9xLMX/PlLnIaIPKeREbROtasHGGTJM0D4u E6eTraCMKRy6LmuF9+P2krLuPOdPHv/ZGi1IBWueSuc5yNJYaKYQk1N/LprFAcnL TXd4yJUEqyAzc6cIxLuVL6FRPPf9dn21bj2Ok/6wvTRkS5o8s0= X-Sasl-enc: 2emfEYYafjZWgtHBKtY0YSEAi3TnYIuwTKcosqlXP5F6 1372998109 Received: from localhost (unknown [69.86.161.244]) by mail.messagingengine.com (Postfix) with ESMTPA id DFD22680204 for ; Fri, 5 Jul 2013 00:21:49 -0400 (EDT) From: Dubiousjim To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH 19/31] abump: tweak upgrade/cvelist Date: Fri, 5 Jul 2013 00:21:28 -0400 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- abump.in | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/abump.in b/abump.in index 33d962d..ddd9715 100755 --- a/abump.in +++ b/abump.in @@ -18,7 +18,8 @@ fi # version bump packages do_bump() { - local p rc=0 pkgname pkgver section upgrade cve message + local p rc=0 pkgname pkgver section message + local upgrade="${cvelist:+security }upgrade" for p; do pkgname=${p%-[0-9]*} pkgver=${p#${pkgname}-} @@ -27,14 +28,10 @@ do_bump() { set -e cd $HOME/aports/*/$pkgname - section=${PWD%/*} upgrade="upgrade" cve= + section=${PWD%/*} section=${section##*/} - if [ -n "$cvelist" ]; then - upgrade="security upgrade" - cve=" ($cvelist)" - fi - message="$section/$pkgname: $upgrade to ${pkgver}${cve}" + message="$section/$pkgname: $upgrade to ${pkgver}${cvelist}" if [ -n "$fixes" ]; then message="$message @@ -86,7 +83,7 @@ fi eval set -- "$args" while true; do case $1 in - -s|--security) cvelist="$2"; shift;; + -s|--security) cvelist=" ($2)"; shift;; -f|--fixes) fixes="$2"; shift;; -R|--recursive) recursive="-R";; -k|--keep) keep="-k";; -- 1.8.3.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---