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 1QRK1n-0001Cj-Na for garchives@archives.gentoo.org; Tue, 31 May 2011 08:10:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37287E02CE; Tue, 31 May 2011 08:10:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0966AE02CE for ; Tue, 31 May 2011 08:10:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 721EB1B4014 for ; Tue, 31 May 2011 08:10:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C7BCA8050B for ; Tue, 31 May 2011 08:10:05 +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: <4c4d152413a0b112eb0ba35528b492c0f8d95e7a.mgorny@gentoo> Subject: [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/pm/, PMSTestSuite/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: PMSTestSuite/cli.py PMSTestSuite/pm/__init__.py PMSTestSuite/pm/portage.py X-VCS-Directories: PMSTestSuite/pm/ PMSTestSuite/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4c4d152413a0b112eb0ba35528b492c0f8d95e7a Date: Tue, 31 May 2011 08:10:05 +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: 26458529d2e5251112e3a99a706ab499 commit: 4c4d152413a0b112eb0ba35528b492c0f8d95e7a Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Tue May 31 08:08:06 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Tue May 31 08:08:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3D4c4d1524 Support specifying additional PM options. --- PMSTestSuite/cli.py | 5 ++++- PMSTestSuite/pm/__init__.py | 1 + PMSTestSuite/pm/portage.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/PMSTestSuite/cli.py b/PMSTestSuite/cli.py index b5c8921..713b1a0 100644 --- a/PMSTestSuite/cli.py +++ b/PMSTestSuite/cli.py @@ -2,7 +2,7 @@ # (c) 2011 Micha=C5=82 G=C3=B3rny # Released under the terms of the 2-clause BSD license. =20 -import os.path +import os.path, shlex =20 from optparse import OptionParser =20 @@ -45,6 +45,8 @@ class PMSTestSuiteCLI(object): opt.add_option('-p', '--package-manager', dest=3D'pm', help=3D'Package manager to use', default=3D'portage') + opt.add_option('-P', '--pm-options', dest=3D'pmopts', + help=3D'Additional options to pass to the Package Manager (shell-quo= ted)') =20 self.optparser =3D opt =20 @@ -71,6 +73,7 @@ class PMSTestSuiteCLI(object): break else: opt.error('Package manager not supported: %s' % opts.pm) + self.pm.pm_options =3D shlex.split(opts.pmopts) =20 try: self.repository =3D EbuildRepository(opts.repo_path) diff --git a/PMSTestSuite/pm/__init__.py b/PMSTestSuite/pm/__init__.py index 0ab91b3..9a2d5ed 100644 --- a/PMSTestSuite/pm/__init__.py +++ b/PMSTestSuite/pm/__init__.py @@ -15,6 +15,7 @@ class PackageManager(object): Base class for various package managers support. """ =20 + pm_options =3D [] repo_paths =3D [] =20 @property diff --git a/PMSTestSuite/pm/portage.py b/PMSTestSuite/pm/portage.py index 4fbeda2..71672c0 100644 --- a/PMSTestSuite/pm/portage.py +++ b/PMSTestSuite/pm/portage.py @@ -36,11 +36,11 @@ class PortagePM(PackageManager): os.chdir(startdir) =20 def merge(self, atoms): - ret =3D subprocess.call([self.emerge_path] + atoms, + ret =3D subprocess.call([self.emerge_path] + self.pm_options + atoms, env =3D {'PORTDIR_OVERLAY': ' '.join(self.repo_paths)}) return ret =3D=3D 0 =20 def unmerge(self, atoms): - ret =3D subprocess.call([self.emerge_path, '--unmerge'] + atoms, + ret =3D subprocess.call([self.emerge_path, '--unmerge'] + self.pm_opti= ons + atoms, env =3D {'PORTDIR_OVERLAY': ' '.join(self.repo_paths)}) return ret =3D=3D 0