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-388817-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RAfM0-0003F2-2J
for garchives@archives.gentoo.org; Mon, 03 Oct 2011 10:02:32 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 341CD21C0E6;
Mon, 3 Oct 2011 10:02:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id E9EB521C0E6
for <gentoo-commits@lists.gentoo.org>; Mon, 3 Oct 2011 10:02:22 +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 6ACF91B4012
for <gentoo-commits@lists.gentoo.org>; Mon, 3 Oct 2011 10:02:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 8D53080042
for <gentoo-commits@lists.gentoo.org>; Mon, 3 Oct 2011 10:02:21 +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: <7b537c443c83b7ad297d4a027d902d8459a75490.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: 7b537c443c83b7ad297d4a027d902d8459a75490
Date: Mon, 3 Oct 2011 10:02:21 +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: 79bac04358db2868f863a1879f88211b
commit: 7b537c443c83b7ad297d4a027d902d8459a75490
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 3 10:02:10 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Oct 3 10:02:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D7b537c44
repoman: account for GLEP 59 in RMD160 check
---
bin/repoman | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/bin/repoman b/bin/repoman
index 20f4b15..711fce9 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -20,6 +20,7 @@ import signal
import stat
import sys
import tempfile
+import textwrap
import time
import platform
=20
@@ -547,24 +548,6 @@ if vcs_global_opts is None:
vcs_global_opts =3D ""
vcs_global_opts =3D vcs_global_opts.split()
=20
-if vcs =3D=3D "cvs" and \
- "commit" =3D=3D options.mode and \
- "RMD160" not in portage.checksum.hashorigin_map:
- from portage.util import grablines
- repo_lines =3D grablines("./CVS/Repository")
- if repo_lines and \
- "gentoo-x86" =3D=3D repo_lines[0].strip().split(os.path.sep)[0]:
- msg =3D "Please install " \
- "pycrypto or enable python's ssl USE flag in order " \
- "to enable RMD160 hash support. See bug #198398 for " \
- "more information."
- prefix =3D bad(" * ")
- from textwrap import wrap
- for line in wrap(msg, 70):
- print(prefix + line)
- sys.exit(1)
- del repo_lines
-
if options.mode =3D=3D 'commit' and not options.pretend and not vcs:
logging.info("Not in a version controlled repository; enabling pretend =
mode.")
options.pretend =3D True
@@ -588,6 +571,7 @@ portdb =3D trees[root]['porttree'].dbapi
# Constrain dependency resolution to the master(s)
# that are specified in layout.conf.
repodir =3D os.path.realpath(portdir_overlay)
+repo_config =3D repoman_settings.repositories.get_repo_for_location(repo=
dir)
repo_info =3D portdb._repo_info[repodir]
portdb.porttrees =3D list(repo_info.eclass_db.porttrees)
portdir =3D portdb.porttrees[0]
@@ -597,8 +581,24 @@ portdir =3D portdb.porttrees[0]
# can be used to prevent merge conflicts like those that
# thin-manifests is designed to prevent.
sign_manifests =3D "sign" in repoman_settings.features and \
- repoman_settings.repositories.get_repo_for_location(
- repodir).sign_manifest
+ repo_config.sign_manifest
+
+manifest_hashes =3D repo_config.manifest_hashes
+if manifest_hashes is None:
+ manifest_hashes =3D portage.const.MANIFEST2_HASH_DEFAULTS
+
+if "commit" =3D=3D options.mode and \
+ repo_config.name =3D=3D "gentoo" and \
+ "RMD160" in manifest_hashes and \
+ "RMD160" not in portage.checksum.hashorigin_map:
+ msg =3D "Please install " \
+ "pycrypto or enable python's ssl USE flag in order " \
+ "to enable RMD160 hash support. See bug #198398 for " \
+ "more information."
+ prefix =3D bad(" * ")
+ for line in textwrap.wrap(msg, 70):
+ print(prefix + line)
+ sys.exit(1)
=20
# Generate an appropriate PORTDIR_OVERLAY value for passing into the
# profile-specific config constructor calls.