From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-382295-garchives=archives.gentoo.org@lists.gentoo.org>) id 1R3s4B-0008NU-IQ for garchives@archives.gentoo.org; Wed, 14 Sep 2011 16:12:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAF4F21C3B9; Wed, 14 Sep 2011 16:11:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A683F21C3B9 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Sep 2011 16:11:17 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17EFA1B4044 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Sep 2011 16:11:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7280580042 for <gentoo-commits@lists.gentoo.org>; Wed, 14 Sep 2011 16:11:16 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <c1eb8e75ba4cb192607a896ad7b72bf8b525740a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c1eb8e75ba4cb192607a896ad7b72bf8b525740a Date: Wed, 14 Sep 2011 16:11:16 +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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 29fadec64cd76934558677a6033bd283 commit: c1eb8e75ba4cb192607a896ad7b72bf8b525740a Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Sep 14 16:08:19 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Sep 14 16:08:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc1eb8e75 repoman: fix KeyError from digestgen with symlink --- bin/repoman | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/bin/repoman b/bin/repoman index e0cdf6e..2180f64 100755 --- a/bin/repoman +++ b/bin/repoman @@ -648,6 +648,13 @@ for x in range(0, repolevel - 1): repodir =3D os.path.dirname(repodir) repodir =3D os.path.realpath(repodir) =20 +# Make startdir relative to the cannonical repodir, so that we can pass +# it to digestgen and it won't have to be cannonicalized again. +if repolevel =3D=3D 1: + startdir =3D repodir +else: + startdir =3D os.path.join(repodir, *startdir.split(os.sep)[-2-repolevel= +3:]) + def caterror(mycat): err(mycat+" is not an official category. Skipping QA checks in this di= rectory.\nPlease ensure that you add "+catdir+" to "+repodir+"/profiles/c= ategories\nif it is a new category.") =20