From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-734215-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 1E53413838B
for <garchives@archives.gentoo.org>; Wed, 24 Sep 2014 17:30:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EB838E0837;
Wed, 24 Sep 2014 17:30:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 99DACE0837
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Sep 2014 17:30:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 76B5A33BE44
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Sep 2014 17:30:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FDDB6227
for <gentoo-commits@lists.gentoo.org>; Wed, 24 Sep 2014 17:30:18 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1411579662.62961bdcb071b6e00418aabbbbfcb4601196ea42.kensington@gentoo>
Subject: [gentoo-commits] proj/qa-scripts:master commit in: /
X-VCS-Repository: proj/qa-scripts
X-VCS-Files: depcheck
X-VCS-Directories: /
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: 62961bdcb071b6e00418aabbbbfcb4601196ea42
X-VCS-Branch: master
Date: Wed, 24 Sep 2014 17:30:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 0daac55c-ab92-452f-b3f2-ea5d5bc228e9
X-Archives-Hash: 3b9fda85ba39d3c64db415c25648715d
commit: 62961bdcb071b6e00418aabbbbfcb4601196ea42
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 24 17:27:42 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 24 17:27:42 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qa-scripts.git;a=commit;h=62961bdc
depcheck: resolve an issue where missing RDEPEND is not reported.
---
depcheck | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/depcheck b/depcheck
index 93abeb1..265615c 100755
--- a/depcheck
+++ b/depcheck
@@ -55,7 +55,7 @@ remove_atom_version() {
virtualcheck() {
debug Checking if ${libowner_pn} is provided by a virtual
- for virtual in $(qdepends --nocolor --name-only --${1} --query ${libowner_pn} | grep ^virtual/)
+ for virtual in $(qdepends --nocolor --name-only --rdepend --query ${libowner_pn} | grep ^virtual/)
do
debug Checking if ${virtual} is in dependencies
local isvirtualdep
@@ -63,16 +63,20 @@ virtualcheck() {
if [ $? -eq 0 ]; then
used_virtuals+=( ${virtual} )
- continue 2
+ local resolved=true
+ break
fi
done
- if [ "${1}" = "depend" ]; then
- eerror "${obj} links to ${link}"
+ if [[ ! ${resolved} ]]; then
+ if [ "${1}" = "depend" ]; then
+ eerror "${obj} links to ${link}"
+ fi
+ eindent
+ eerror Missing ${1^^} on $(bold ${libowner_pn})
+ eoutdent
fi
- eindent
- eerror Missing ${1^^} on $(bold ${libowner_pn})
- eoutdent
+
errors=1
}