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 1QpNuP-0003Gm-2s for garchives@archives.gentoo.org; Fri, 05 Aug 2011 17:10:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2371D21C1E7; Fri, 5 Aug 2011 17:09:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E947A21C1E5 for ; Fri, 5 Aug 2011 17:09:27 +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 6815F1B401C for ; Fri, 5 Aug 2011 17:09:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 66C0480048 for ; Fri, 5 Aug 2011 17:09:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: pmstestsuite/cli.py X-VCS-Directories: pmstestsuite/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d44574ba1acd5589dd1a4072bd7e01a5e171b6e9 Date: Fri, 5 Aug 2011 17:09:26 +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: 38652cf810913eca8975b31ab724fc21 commit: d44574ba1acd5589dd1a4072bd7e01a5e171b6e9 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Aug 5 15:47:41 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Aug 5 15:47:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3Dd44574ba Support doing the Manifests with multiple PMs. --- pmstestsuite/cli.py | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pmstestsuite/cli.py b/pmstestsuite/cli.py index 52e14cc..607d3ce 100644 --- a/pmstestsuite/cli.py +++ b/pmstestsuite/cli.py @@ -127,9 +127,7 @@ class PMSTestSuiteCLI(object): if pmset: opt.error('PM(s) not supported: %s' % ', '.join(pmset)) =20 - self.pm =3D self.pms.pop() - if self.pms: - raise NotImplementedError('Using multiple PMs not implemented yet') + self.pm =3D self.pms[0] =20 os.umask(0o22) =20 @@ -222,7 +220,22 @@ class PMSTestSuiteCLI(object): =20 self.repository.write_files(files) if self.update_manifests: - self.repository.remanifest(files, self.pm) + needs_manifests =3D False + for pm in self.pms: + needs_manifests |=3D pm.requires_manifests + try: + self.repository.remanifest(files, pm) + except NotImplementedError: + pass + else: + break + else: + if needs_manifests: + print('No PM was able to do the Manifests, failing.') + return 1 + + if len(self.pms) > 1: + raise NotImplementedError('Using multiple PMs not implemented yet') =20 for t in self.test_library: t.clean(self.pm)