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-0001Ci-Oh 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 3FE17E0462; 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 0D32CE0462 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 75BFB1B4015 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 8646C80508 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: Subject: [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/pm/, PMSTestSuite/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: PMSTestSuite/pm/__init__.py PMSTestSuite/pm/portage.py PMSTestSuite/testrunner.py X-VCS-Directories: PMSTestSuite/pm/ PMSTestSuite/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b03e95f288317a206980038576a1b5f00cf7abe9 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: 80db0e196a25b9c0b99e281d25bab9af commit: b03e95f288317a206980038576a1b5f00cf7abe9 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Tue May 31 07:59:48 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Tue May 31 07:59:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3Db03e95f2 Support unmerging packages before proceeding. --- PMSTestSuite/pm/__init__.py | 10 ++++++++++ PMSTestSuite/pm/portage.py | 7 ++++++- PMSTestSuite/testrunner.py | 2 ++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/PMSTestSuite/pm/__init__.py b/PMSTestSuite/pm/__init__.py index 8189f83..0ab91b3 100644 --- a/PMSTestSuite/pm/__init__.py +++ b/PMSTestSuite/pm/__init__.py @@ -60,6 +60,16 @@ class PackageManager(object): """ raise NotImplementedError('Please override the merge() method.') =20 + def unmerge(self, atoms): + """ + Run PM to unmerge . + + Returns True if PM run successfully, False otherwise. Please note that + this return code may not have anything to do with ebuilds actually + getting removed. + """ + raise NotImplementedError('Please override the unmerge() method.') + def get_package_managers(): """ Return the list of supported Package Managers. """ =20 diff --git a/PMSTestSuite/pm/portage.py b/PMSTestSuite/pm/portage.py index d31bd44..4fbeda2 100644 --- a/PMSTestSuite/pm/portage.py +++ b/PMSTestSuite/pm/portage.py @@ -22,7 +22,7 @@ class PortagePM(PackageManager): import portage except ImportError: return False - =09 + ret =3D True for prog in (cls.emerge_path, cls.repoman_path): ret &=3D os.access(prog, os.X_OK) @@ -39,3 +39,8 @@ class PortagePM(PackageManager): ret =3D subprocess.call([self.emerge_path] + atoms, env =3D {'PORTDIR_OVERLAY': ' '.join(self.repo_paths)}) return ret =3D=3D 0 + + def unmerge(self, atoms): + ret =3D subprocess.call([self.emerge_path, '--unmerge'] + atoms, + env =3D {'PORTDIR_OVERLAY': ' '.join(self.repo_paths)}) + return ret =3D=3D 0 diff --git a/PMSTestSuite/testrunner.py b/PMSTestSuite/testrunner.py index c1d2597..76f7071 100644 --- a/PMSTestSuite/testrunner.py +++ b/PMSTestSuite/testrunner.py @@ -9,6 +9,8 @@ class TestRunnerCLI(EbuildGenCLI): =20 self.pm.append_repository(self.repository) atoms =3D ['=3D%s' % t.p for t in self.test_library] + print('-> Unmerging already-merged test ebuilds...') + self.pm.unmerge(atoms) print('-> Running PM...') self.pm.merge(atoms) =20