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 ) id 1R3uO9-0001vu-Gn for garchives@archives.gentoo.org; Wed, 14 Sep 2011 18:40:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E537A21C131; Wed, 14 Sep 2011 18:40:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B680321C12B for ; Wed, 14 Sep 2011 18:40:35 +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 01DD81B4022 for ; Wed, 14 Sep 2011 18:40:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5C4CC80042 for ; Wed, 14 Sep 2011 18:40:34 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <280f10d42a8fbfe3b4b34eb18e6ea5f8dd3ff484.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: 280f10d42a8fbfe3b4b34eb18e6ea5f8dd3ff484 Date: Wed, 14 Sep 2011 18:40:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 69a677bb64abf1ad574bc81c04768d2e commit: 280f10d42a8fbfe3b4b34eb18e6ea5f8dd3ff484 Author: Zac Medico gentoo org> AuthorDate: Wed Sep 14 18:34:19 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Sep 14 18:34:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D280f10d4 repoman: use the repodir variable more --- bin/repoman | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bin/repoman b/bin/repoman index 2180f64..3189797 100755 --- a/bin/repoman +++ b/bin/repoman @@ -587,8 +587,8 @@ portdb =3D trees[root]['porttree'].dbapi =20 # Constrain dependency resolution to the master(s) # that are specified in layout.conf. -portdir_overlay =3D os.path.realpath(portdir_overlay) -repo_info =3D portdb._repo_info[portdir_overlay] +repodir =3D os.path.realpath(portdir_overlay) +repo_info =3D portdb._repo_info[repodir] portdb.porttrees =3D list(repo_info.eclass_db.porttrees) portdir =3D portdb.porttrees[0] =20 @@ -598,7 +598,7 @@ portdir =3D portdb.porttrees[0] # thin-manifests is designed to prevent. sign_manifests =3D "sign" in repoman_settings.features and \ repoman_settings.repositories.get_repo_for_location( - portdir_overlay).sign_manifest + repodir).sign_manifest =20 # Generate an appropriate PORTDIR_OVERLAY value for passing into the # profile-specific config constructor calls. @@ -642,17 +642,12 @@ if options.mode =3D=3D 'commit' and repolevel not i= n [1,2,3]: print(red("***")) err("Unable to identify level we're commiting from for %s" % '/'.join(r= eposplit)) =20 -startdir =3D normalize_path(mydir) -repodir =3D startdir -for x in range(0, repolevel - 1): - repodir =3D os.path.dirname(repodir) -repodir =3D os.path.realpath(repodir) - # 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 normalize_path(mydir) startdir =3D os.path.join(repodir, *startdir.split(os.sep)[-2-repolevel= +3:]) =20 def caterror(mycat):